IpInterfacepolicy does not overwrite snmp poll any more

During node scan ip interface scan will overwrite
the snmp poll for OnmsSnmpInterface.
The snmpPoll is not initialed anymore.
The snmpPoll is explictly set when creating
the OnmsSnmpObject.
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12
this test is hard to change; it is much nicer in 1.12+, just skip it
fix capsd integration test to not conflict with 172.20.1.x
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/capsd/CapsdTest.java
Merge remote-tracking branch 'origin/1.12'