[1130085] rhq-server-env.sh.default is overwritten when first upgrade attempt fails
Add FileReverters for the -env files. So, on cancel the unmodified version of
the file should be restored.

Cherry-pick master 457b04a0083522ce5afebf037aa6af018573b582