Merge "Bug 1586: Do not use JaxRS 2.0 unnecessarily"