...
:erge branch 'JPA.2' of github.com:OpenNMS/opennms into JPA.2