Merge "Jersey jar mismatch error"