Sync all options when upgrading Jetpack
Merge pull request #1372 from Automattic/update/sync-all-options-when-upgrading

Sync all options when upgrading Jetpack
Rebase, Only sync main_network_site when we update the plugin

Currently plugin_upgrade runs everytime,
So we use the general sync every option to ensure that
main_network_site gets pushed to .com
Resolve conflicts and remove space