am 411252cd: Merge "Guarantee that db, shm and wal files are deleted together."

* commit '411252cd75a29c7e184ee13cd15e8598851afb64':
  Guarantee that db, shm and wal files are deleted together.