[ENGINE-6: changes on apps api]
[ENGINE-6: changes related to api]
[ENGINE-6]
Merge branch 'master' into ENGINE-6

Conflicts:
	commons/pom.xml
	core/pom.xml
	fsqueues/pom.xml
	shutdownhook/pom.xml