Merge "Revert "Revert "Add message number constants matching DeleteUser and Del..."""