JBIDE-14107 further cleanup, requires java7, etc