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
Merge branch 'develop' into feature/CLOUDIFY-1722
CLOUDIFY-1722 add some javadoc, use inner static classes as test configs
CLOUDIFY-1722 add cosmo prefix to all injected properties
CLOUDIFY-1722 remove init methods from different components, change close methods names to 'close', update pom.xmls to 1.7
CLOUDIFY-1722 update api projects to use java 1.7
CLOUDIFY-1722 remove obsolete test
CLOUDIFY-1722 update test property files to use new cosmo prefix for broker port
Merge branch 'origin' of https://github.com/CloudifySource/cosmo-manager into feature/CLOUDIFY-1722