Jetpack: Merging r812008 and r812336 into the 2.6 legacy branch -- loading in two additions to the conflicting plugins array.

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