Optimize pom.xml
Merge branch 'develop' of https://github.com/CloudifySource/cosmo-manager into develop

Conflicts:
	orchestrator/pom.xml