CE Upstream - Wednesday
Resolved conflicts:
UU CHANGELOG.md
UU app/assets/javascripts/diff_notes/diff_notes_bundle.js
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Resolved conflicts:
UU CHANGELOG.md
UU app/assets/javascripts/diff_notes/diff_notes_bundle.js