Fix for JERSEY-2002: performance improvements
Fix for JERSEY-2099: HK2 version upgrade: b14->b21

Change-Id: I92f976ca7a45bec54d3b8aff28cf91e9121abe1b