login and Certman AAF Integration changes

Issue-ID: PORTAL-386, PORTAL-389

failed to create user with special char in login_id

Change-Id: I415adf615a7af97319d8d11a740e75d3dfa11583
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com>
diff --git a/deliveries/Dockerfile.portal b/deliveries/Dockerfile.portal
index 81eeb65..9b9f548 100644
--- a/deliveries/Dockerfile.portal
+++ b/deliveries/Dockerfile.portal
@@ -11,6 +11,7 @@
 ARG FE_DIR=build/public
 ARG HTTP_PROXY
 ARG HTTPS_PROXY
+# ARG PORTAL_CERT=truststoreONAPall.jks
 
 # Just variables, never passed in
 ARG TOMCAT=apache-tomcat-8.0.37
@@ -31,6 +32,7 @@
 # Remove manager and sample apps
 RUN rm -fr ${TOMCAT}/webapps/[a-z]*
 RUN mkdir -p /opt
+COPY ${SERVERXML} ${TOMCAT}/conf
 RUN mv ${TOMCAT} /opt
 
 WORKDIR ${TOMCATHOME}/webapps