make bamboo go greeeeeeen!
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/InvalidRequisitionDataTest.java
Merge remote-tracking branch 'opennms/1.12'

Conflicts:
	opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/InvalidRequisitionDataTest.java