Merge branch '1.3.x' into 1.4.x

diff --cc deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
index 5012b42,8d5d776..68cfc18
--- 1/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
--- 2/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
@@@ -65,26 -65,10 +65,26 @@@ data
    JOBS_RABBITMQ_ACCOUNTGROUPUSERSVC2JOBSRABBITSENDER_ENABLED: "false"
  
  
-   #ipaddr
-   IPADDR_API_URL: http://ipaddr.ipaddr.svc.cluster.local:9090/v1/find
- 
- 
+   #ipaddr
+   IPADDR_API_URL: http://ipaddr.ipaddr.svc.cluster.local:9090/v1/find
+ 
+ 
 +  CASSERVER_SA_API_SERVER_URL: http://cas-server-sa-api-svc.cas-server.svc.cluster.local:8080
 +  CASSERVER_SA_API_CLIENT_AUTH_ENABLED: "false"
 +  #CASSERVER_SA_API_CLIENT_AUTH_KEY_PASSWORD: ""
 +  #CASSERVER_SA_API_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/client/client.keystore
 +  #CASSERVER_SA_API_CLIENT_AUTH_KEYSTORE_PASSWORD: ""
 +  #CASSERVER_SA_API_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/client/client.truststore
 +  #CASSERVER_SA_API_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
 +
 +
 +  AUTHX_LOG_ENABLED: "true"
 +  AUTHX_LOG_RABBITMQ_HOST: rabbitmq-server.authx-service.svc.cluster.local
 +  AUTHX_LOG_RABBITMQ_PORT: "5672"
 +  AUTHX_LOG_RABBITMQ_USERNAME: guest
 +  AUTHX_LOG_RABBITMQ_PASSWORD: guest
 +
 +
    LOGGING_LEVEL_COM_SUPWISDOM_GOA: INFO
    LOGGING_LEVEL_COM_SUPWISDOM_INSTITUTE_GOA_COMMON_LOG: INFO
  

diff --cc deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml
Simple merge