Patch Set 2: Looks good to me, approved; IP review completed

- rebased
- added update for the other test bundle
- improved commit message
- I tried replacing Jetty 7.5 with Jetty 8.0.4 but this needs more dependencies so let's go for this workaround for now