jersey 2.9 + some re-ordering

Change-Id: I90b3ffde4e04e6df5cf504dbf081ab7f12965f38