JERSEY-2315 Import reorganized after pull-request

Change-Id: I019bf5963be4b44f3166f3eddabe37b4e4aa73b9