[PRD-5005] - Added check to prevent double escape of already escaped str...

...ings