Merge branch 'refs/heads/release' into merge-hotfix

# Conflicts:
#	common/pom.xml
#	enterprise-adapter/pom.xml
#	formcycle-adapter/formcycle-adapter-impl/pom.xml
#	formcycle-adapter/formcycle-adapter-interface/pom.xml
#	formcycle-adapter/pom.xml
#	formsolutions-adapter/pom.xml
#	forwarder/pom.xml
#	intelliform-adapter/pom.xml
#	pom.xml
#	router/pom.xml
#	semantik-adapter/pom.xml
#	xta-adapter/pom.xml