Merge branch 'hostfix_v0.5.0' into develop

# Conflicts:
#	dmp-business/dmp-rwd/src/main/resources/db/init/schema.sql