Merge branch 'master' into 2.5.0.RELEASE

crss-uaa/crss-uaa.yml

@@ -28,7 +28,7 @@ crss:
       auto-approve: true
       authorized-grant-types: authorization_code,refresh_token,password
       access-token-validity-second: 3600
-      registered-redirect-uris: https://crss.wesmsys.local,https://bsmd.crss.wesmsys.local,http://crss.wesmsys.local,http://bsmd.crss.wesmsys.local
+      registered-redirect-uris: https://crss.wesmsys.local,https://bsmd.crss.wesmsys.local
       client:
         client-id: crss
         client-secret: crsssecret