Fix subnet and ip CIDR in entity rules. closes #2452