Merge remote-tracking branch 'origin/release' into dev-cancel-1207

# Conflicts:
#	server/src/main/resources/bootstrap-dev.properties
#	server/src/main/resources/bootstrap-test1.properties
#	server/src/main/resources/bootstrap-uat.properties