Merge "Update OWNERS for some server/pm/User files"