Revert "Revert "Merge pull request #12206 from qdot/915920""

This reverts commit 4433c772ad5d1367157dddae08ce235ee28096b2.
Bug 915920 - Fix gjslint quote errors
Merge pull request #12231 from qdot/revert-revert-915920

Revert revert 915920