fix for OPENNMS-NMS112-15, bad model messing up tests
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'