Also wipe before shutting down

Don't rely on the client to be able to tell the nodes to wipe.
Merge branch 'clear-queue-with-wipe' into travis-random-testing