Slight refactoring of getJoinURLwithDynamicConfigXML() to make consistent with other functions in bbb_api.jsp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bbb-api-demo/src/main/webapp/bbb_api.jsp