Bug 948120 - Bump mozbase dependencies to fix rmtree/remove issues in Mozmill and fixup import lines. r=dhunt