Jersey 2255

Fixing https://java.net/jira/browse/JERSEY-2255.  Includes integration test as well