[BUG #7288] fix proper quoting/escaping of strings with embedded quotes