Merge branch 'master' into bug/JUDDI-977

# Conflicts:
#	uddi-tck/pom.xml