NOJIRA: Comment out login-rologin-pwd message, since it can't be overridden. This message will need to be added to all tenant overlays.
Merge branch 'ucb-deploy_3.2' into pahma_3.2