Double to single quotes, minor lint space issue.
Remove trailing white-space.
Merge pull request #10051 from s0undt3ch/develop

Double to single quotes, minor lint space issue.