Revert previous fix for deleted name change, update how we change username when a user is marked inactive to keep it under 30 chars.

awx/main/tests/commands.py

@@ -226,6 +226,8 @@ class CleanupDeletedTest(BaseCommandTest):
         # "Delete some users".
         for user in User.objects.all():
             user.mark_inactive()
+            self.assertTrue(len(user.username) <= 30,
+                            'len(%r) == %d' % (user.username, len(user.username)))
         # With days=1, no users will be deleted.
         counts_before = self.get_user_counts()
         self.assertTrue(counts_before[1])