Fixed tests to be used with Cargo plugin
Merge branch 'develop' into stanislav.skrebtsov

Conflicts:
	cmis-types-manager-ejb/src/test/java/com/engagepoint/ejb/TestService.java