Bug 958606; Bug 959833; Fix standalone.xml env replacement typos