Jersey 2.0

Updated Jersey 2.x branch (based on @saadmufti's branch, PR #545).
Do we want `{}` around this to match the standards?