committing to save changes but does not yet compile
Fixing build
Removing accidental add
Merge remote-tracking branch 'origin/master' into osgi_fix_jetty9
Merge remote-tracking branch 'origin/master' into osgi_fix_jetty9
Removing accidental add of copy of old test-jetty-osgi