Update relevant resources to support 1.11.x - RESTWS-473(cherry picked from commit 3145d667e3356e482df7e132e66f5f7398a5aad5)