Merge "Reorder keys for fileStoragePathsForOps() function since its a list."