more JDK7/etc. fixes (OPENNMS-NMS112JDK17-TEST-5)
ignore .swp file from vim
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'
Merge branch 'master' into pull-requests