CIDR infra support.
Test policy inheritance.
Merge pull request #153 from ritamganguly/master

CIDR infra support.