remove facia-first-container-layout-override and extend life of facia-tool-tags
Merge pull request #4601 from guardian/switches-cleanup

switches cleanup