Merge SaadMufti's jersey2 changes with master, fix parent pom

I also code reviewed, looks good to me