Partial merge between WPCOM and Jetpack

Pushing this across because it's EOD on Friday.  There's a few more changesets that still need to get synced between wpcom and Jetpack -- I'll probably tackle them over the weekend of early next week.