Make separate tests without and with ?ALWAYS
Restore test/cleanup.erl
Temp hack for buildbot testing: LEVELDB_VSN="mv-google-filelock"