Deprecation formatter 2 99 cherrypicks

These `DeprecationFormatter` cherry picks always seem to have conflicts, so letting Travis do its magic to make sure I merged them right.