Added scheduler shutdown null checks.
Allow '--font <tag>:<size>' without requiring a trailing colon.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-rrd/opennms-rrd-jrobin/src/main/java/org/opennms/netmgt/rrd/jrobin/JRobinRrdStrategy.java
Merge remote-tracking branch 'origin/space/13.2'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/threshd/Threshd.java