Follow-up to bug 811790 - migrate bumpFiles changes to comm-esr10 as well. r=bhearsum