CLOUDIFY-1722 continue spring di integration
Merge remote-tracking branch 'origin/feature/CLOUDIFY-1722' into feature/CLOUDIFY-1722

Conflicts:
	orchestrator/pom.xml
CLOUDIFY-1722 remove unused dependency