Skip file descriptor in JMX tests, since they don't exist on Windows
Merge branch '1.12'

Conflicts:
	opennms-services/src/test/java/org/opennms/netmgt/collectd/JMXCollectorTest.java