allow ssh_interface: private_ips to work when public_ips exist
ignore_cidr should return False when netaddr is missing
Merge branch 'develop' of github.com:erchn/salt into develop