Update relevant resources to support 1.11.x - RESTWS-473