Bug 916072 - Update cleanup to reflect change of persistent storage path
Merge pull request #1367 from davehunt/bug916072

Bug 916072 - Update cleanup to reflect change of persistent storage path