Merge branch 'tester-jersey-webapp'
Merge remote-tracking branch 'upstream/master'