backport settings.xml url corrections to master branch
Merge branch 'master' into 2.5.0

Conflicts:
	resources/settings.xml
	
Fix &amp reference