Merge "Fix clobbered shared user install permissions."