Merge proposals dependent on lp://qastaging/~james-page/swift/fixup-cache-perms

lp://qastaging/~james-page/swift/fixup-cache-perms has no merge proposals.