Plugin: Make sure that plugin can only be network activated if we explicity tell them to be
Merge pull request #1415 from Automattic/fix/updating-network-wide-plugins

Plugin: Make sure that plugin can only be network activated if we explicity tell them to be