Fix of #SPC-480
allow overriding opennms.conf with a user-specific file
Merge branch '1.12'