fix initial creation of meta file immediately
Merge branch '1.12'

Conflicts:
	opennms-rrd/opennms-rrd-jrobin/src/main/java/org/opennms/netmgt/rrd/jrobin/JRobinRrdStrategy.java
	opennms-services/src/test/java/org/opennms/netmgt/collectd/PersistOperationBuilderTest.java
	opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpCollectorTest.java
Merge branch 'master' into pull-requests