Jetpack: Merge in media-extractor and twitter-cards fixes from trunk to the 2.6 branch (r810865)

git-svn-id: https://plugins.svn.wordpress.org/jetpack/branches/2.6@811463 b8457f37-d9ea-0310-8a92-e5e31aec5664