fix for exception while running headless
Merge branch 'win32-fixes' of git://github.com/OpenNMS/opennms into win32-fixes

Conflicts:
	opennms-util/src/main/java/org/opennms/core/utils/StringUtils.java