CA-97297: ErrorMsg - Cannot remove parameters from read-only map
Merge pull request #1012 from siddharthv/CA-97297

CA-97297: ErrorMsg - Cannot remove parameters from read-only map