Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	cmis-types-manager-ejb/src/main/java/com/engagepoint/CMISConnectException.java
	cmis-types-manager-ejb/src/main/java/com/engagepoint/CMISService.java