Fix for #NMS-6125. Also added Smoketests and fixed other Exception-Mappings.
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12