Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-mr2 * commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54': Revive backup tests
Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-mr2 * commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54': Revive backup tests