Deprecation formatter 2 99 cherrypicks
Created by: soulcutter
These DeprecationFormatter cherry picks always seem to have conflicts, so letting Travis do its magic to make sure I merged them right.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: soulcutter
These DeprecationFormatter cherry picks always seem to have conflicts, so letting Travis do its magic to make sure I merged them right.