changed database name for openshift
Merge remote-tracking branch 'origin/develop' into develop
changed checksum policy
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	client/pom.xml
Merge remote-tracking branch 'origin/develop' into develop