Aligned to Comsat 0.3.0-SNAPSHOT and fixed jetty for classloading-time instrumentation