Merges DataModel 21 and 22
Nukes legacy Notification Migration Mapping
Merge pull request #2331 from wordpress-mobile/issue/2329-merging-datamodel-21-and-22

Merges DataModel 21 and 22