fix a merge issue
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	smoke-test/src/test/java/org/opennms/smoketest/OpenNMSSeleniumTestCase.java