Fix problems with overlapping 'allowed IP subnets' in CP
Merge pull request #370 from bcyrill/cp_patch2

Fix problems with overlapping 'allowed IP subnets' / pipes in CP