# Conflicts:
#	smp-ui-tests/src/test/java/ui/DomainPgTest.java

Merge in EDELIVERY/smp from performanceImprovements to development

* commit 'edb5b5fc':
  added screenshots on test failure, SUT info, and other minor fixes
  minor fixes
  ...increased wait time for element to be gone
  minor fixes

Merge in EDELIVERY/smp from bugfix/EDELIVERY-10114-smlsmpid-add-warning to development

* commit '058a7e7ea3b1b3aaaae62949b3342f9d6b38015f':
  ADD length warning also to domain dialog SML SMP ID and SML Domain
  ADD length warning also to domain dialog SML SMP ID and SML Domain

Merge in EDELIVERY/smp from bugfix/EDELIVERY-9564-rest-api-user-not-found-for-header-for-invalid-http-header-servicegroup-owner to development

* commit 'b47fdac74947ec15a985d5ad305312d5a28adda6':
  Fix the error for invalid ServiceGroup owner

Merge in EDELIVERY/smp from bugfix/EDELIVERY-10133-invalid-domain-code-not-throwing-an-error-message to development

* commit '55090446716b0177289bfdc4c410d7aceb5dc46f':
  Fix the error for invalid ServiceGroup owner
  add warning when domain code hits the max length

Merge in EDELIVERY/smp from EDELIVERY-9785-in-the-service-metadata-wizard-when-uploading-certificate-if-the-user-chooses-invalid to development

* commit '10806d0a8059442cd872b785a895569e014421c9':
  Add error message to the metadata service wizard dialog

Pull request #236: Upgrade BDMSL version to 4.2-RC1 with "optional participant schema" in test environment

Merge in EDELIVERY/smp from EDELIVERY-9743-500-error-after-identifiersbehaviour.scheme.mandatory-is-set-to-false-and-user to development

* commit '44b33c26f7aa0874adeaaaa9381776bb9651203e':
  Upgrade BDMSL version to 4.2-RC1 with "optional participant schema" in test environment

Merge in EDELIVERY/smp from bugfix/EDELIVERY-10114-smlsmpid-in-domain-popup-accepting-the-invalid-value to development

* commit 'aae6b7436df1888fb79c7ebbdfcc727f48450194':
  UI: fix smpIdDomainPattern and subDomainPattern regular expressions validation

Merge in EDELIVERY/smp from EDELIVERY-9784-open-cas-button-should-be-moved-from-add-edit-user-dialog-to-the-sandwich-menu-in to development

* commit '8953f21287eac02e9c56ecaa375ba4f7460760c8':
  UI: add action to open SSO data from "sandwich menu"

Merge in EDELIVERY/smp from restBaseIssue to development

* commit '275980bbe5cc88c4dd1af29130f0ca4cefe87ce6':
  method name is updated and the log statement is also updated.
  new test cases added

Merge in EDELIVERY/smp from EDELIVERY-10167-wrong-error-messages-for-disabled-truststore-validation-on-the-ui-user-page to development

* commit 'dd054f89b22308740db719fb2d134670049bf283':
  PR Updates
  Truststore object is set even if is not configured correctly. Add truststore/keystore type as configuration option

Truststore object is set even if is not configured correctly. Add truststore/keystore type as configuration option

Merge in EDELIVERY/smp from bugfix/EDELIVERY-9739-user-removed-as-owner-of-sg-after-editing-extension to development

* commit '6ee8001e06f36fbf05ef37916c0ea50d751d30a9':
  Fix service group update

Merge in EDELIVERY/smp from master to development

* commit '39d1ed794b3ce2d3841a2f8ca08bf20db0dfdb58':
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release 4.2
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release 4.2-FR

Merge in EDELIVERY/smp from restBaseIssue to development

* commit '1bbbf5cddc0d3ccaebde6330f7ecc9241e5bbbf6':
  Failed testcases got fixed.
  Failed testcases got fixed.

Merge in EDELIVERY/smp from restBaseIssue to development

* commit '06303615ea0e11bd589b97da0acfc52fbab43cad':
  New Test cases has been added.