Merge "Bump javax.ws.rs-api version to 2.0"