Fix NMS-5924 (Remove deprecated per-instance SNMP-Informant collection and graph definitions)
clean up some HTTP/jetty-related stuff
Merge branch '1.12'