Merge with origin/master.

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/vacuumd/AutomationProcessor.java
	opennms-services/src/main/java/org/opennms/netmgt/vacuumd/Vacuumd.java