restore the merging tests.
Ensure write.lock shows on directory listings.
Merge branch 'master' into strict_file_checking