Merge branch 'UAR-541' into release
Merge branch 'UAR-605' into release

Conflicts:
	src/main/resources/META-INF/kc-config-defaults.xml
Merge branch 'UAR-563' into release
Merge branch 'UAR-655' into release
Merge branch 'UAR-564' into release

Conflicts:
	src/main/resources/META-INF/kc-config-defaults.xml
UAR-710 merging release to master for release 5.2.1-ua-release2 with fixes for UAR-622, UAR-541, UAR-605, UAR-592, UAR-563, UAR-655 and UAR-564
Merge branch 'master' into development

Conflicts:
	src/main/resources/META-INF/kc-config-defaults.xml