Bug 986380 - the backup file is unnecessarily paranoid and causing problems by being in the wrong context.
Merge pull request #3124 from rmillner/BZ986380_stg

Merged by openshift-bot