Changes based on installation of cruncher, csa and apis
fixed SR installation and added CSA_ADMIN team for the admin user
Merge branch 'master' into BACKLOG-1203

Conflicts:
	scripts/components/serviceregistry.sh
	scripts/install_openconext.sh