Refactor logging to match OpenNMS master so NG will compile