New single deployment file.
Make sure that the apps are installed under tomcat user and not ROOT.
Merge branch 'develop' into feature-my-idp-sps-backlog-1394

Conflicts:
	deploy/deploy-to-t02.sh
Fix app name to deploy.