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

Pulling into `v1.2` from `master`