CE upstream: Friday
CONFLICT (content): Merge conflict in app/views/layouts/nav/_new_admin_sidebar.html.haml
CONFLICT (content): Merge conflict in app/assets/stylesheets/pages/projects.scss
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
CONFLICT (content): Merge conflict in app/views/layouts/nav/_new_admin_sidebar.html.haml
CONFLICT (content): Merge conflict in app/assets/stylesheets/pages/projects.scss