more JDK7/etc. fixes (OPENNMS-NMS112JDK17-TEST-5)