Custom location URIs for PMLSD
Merge branch 'mbst-9478-sitemap-improvements' into stage