STS-3212 Fix pushed to nightly build. Also fixed bug with parsing value
variables that start with $ but do not have a starting bracket {.