Merged codebased deployment

Changes to merged codebase needed for deployment.
It looks like there are a few more of these in this file (e.g. line 917), and another in def.ui.microsite.mobile.css, and a few more in templates/admin/seo/configuration/*.html. Those should probably be changed too.