BUGFIX: Clear sitemap registration at the end of each test
Merge branch 'master' into upstream-master (big-o team branch)