Bug 922062 - Skip cleanUp steps that are not necessary when --restart is passed in. r=bebe r=davehunt