Bug 916064 - Update to support persistent storage path changes