Merge pull request #231 from unwin/develop

Fi for FB 4687 Google public image search is broken
Merge pull request #233 from unwin/develop

Develop
Merge pull request #235 from unwin/develop

* allow rules that have multiple cidr's to be fractured for display, and
removed setting providerDataCenterId to the preferred datacenter as it
is not the same thing.