Merge pull request #8553 from tianon/fix-over-aggressive-shell-interpolation-regex

Fix builder from being over-aggressive on ${}