Fix for JERSEY-1905.
 please *do not approve* until performance test for JERSEY-1905 gets approved!

Change-Id: I30534ad633ae27aef23e34faa3d4fc266d618904
Merge "Fix for JERSEY-1905.  please *do not approve* until performance test for JERSEY-1905 gets approved!"