Merge remote-tracking branch 'origin/master'

Conflicts:
	bridge/src/main/java/org/tiaa/clientplansetup/rs/mapping/MvasClientSetupReportMapping.java