Merge branch 'master' into OpenIDConnect

Conflicts:
	libraries/mixedjslibs/build.xml
	services/roleUUPrototype/src/main/webapp/script/xmpp/strophe.js