CONFLICT! updated kcm flaky test

Reviewed-by: Scott Poore <spoore@redhat.com>
(cherry picked from commit 77fc6ff)

Author: Dan Lavu

src/tests/system/tests/test_kcm.py

@@ -385,7 +385,11 @@ def test_kcm__tgt_renewal_updates_ticket_as_configured(client: Client, kdc: KDC)
         with client.auth.kerberos(ssh) as krb:
             krb.kinit("tuser", password="Secret123", args=["-r", "2s", "-l", "2s"])
             init_start, _ = krb.list_tgt_times(kdc.realm)
+<<<<<<< HEAD
             time.sleep(2)
+=======
+            time.sleep(5)
+>>>>>>> 77fc6ff1d (updated kcm flaky test)
             renew_start, _ = krb.list_tgt_times(kdc.realm)
 
             assert init_start < renew_start, "Renewed ticket time is not greater than the original issued time!"