Merge "Added CAS logic to User::addAutopromoteOnceGroups"