Fix for JERSEY-2231 - CORS/restricted headers issues

Change-Id: I01bbf5829379201903ad8057f752c82229737d1d