Remove baseUri parameter; it's used for rewriting
Merge branch 'mbst-9478-sitemap-improvements' into stage

Conflicts:
	src/main/java/org/atlasapi/feeds/sitemaps/SiteMapController.java