backport settings.xml url corrections to master branch