JBIDE-16893 - updating dedfault server and runtime types (cleanup)