Bug 878587 - Fixes for testMasterPassword to diminish intermittent-failures caused by slow devices. r=jmaher