Allow for CIDRs that match all addresses.
Merge branch 'plw' of github.com:Metaswitch/calico into plw