Merge branch 'master' into feature/JUDDI-978

# Conflicts:
#	docs/asciidoc/ClientGuide/pom.xml
#	docs/asciidoc/Guide/pom.xml
#	docs/asciidoc/pom.xml
#	pom.xml