Merge branch '2.3.x' into 2.4.x

crss-uaa/crss-uaa-ldap.yml

@@ -1,8 +1,8 @@
 crss:
   ldap:
-    protocol: LDAP
+    protocol: LDAPS
     host: "192.168.95.106"
-    port: 389
+    port: 636
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: MO,MP,SO
     admin-user: "wesmsys\\crss_user"