BZ-1168298 - Locked ParameterMap Error during execution of REST query operations

(cherry picked from commit d6a313a73ff6ab69410da1bc8a5b9af6d4f1465c)