Merge pull request #6334 from UtahDave/develop

Escape the $s because they're being interpolated
bsd_shadow: add note on escaping dollar signs
Merge pull request #6336 from terminalmage/quickfix

bsd_shadow: add note on escaping dollar signs
Use proper escapes for Travis' sanity