Add fix for follow up on NMS-2793
reuse addresses, should hopefully fix TIME_WAIT issues
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	tests/mock-snmp-agent/src/main/java/org/opennms/mock/snmp/MockSnmpAgent.java