Bug 958606; Bug 959833; Fix standalone.xml env replacement typos
Merge pull request #2354 from ironcladlou/bz/959833

Merged by openshift-bot