DROP_COMMIT_BEFORE_MERGE: drop some actions around certs

Temporarily disabled, not sure now why. The commit will be for
sure changed or dropped before the merge.

repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py

@@ -555,7 +555,7 @@ def _copy_certificates(context, target_userspace):
     backup_pki = os.path.join(target_userspace, 'etc', 'pki.backup')
 
     with mounting.NspawnActions(base_dir=target_userspace) as target_context:
-        files_owned_by_rpms = _get_files_owned_by_rpms(target_context, '/etc/pki', recursive=True)
+        files_owned_by_rpms = _get_files_owned_by_rpms(target_context, '/etc/pki', recursive=False)
         api.current_logger().debug('Files owned by rpms: {}'.format(' '.join(files_owned_by_rpms)))
 
     # Backup container /etc/pki
@@ -626,7 +626,7 @@ def _prep_repository_access(context, target_userspace):
     # NOTE(dkubek): context.call(['update-ca-trust']) seems to not be working.
     #               I am not really sure why. The changes to files are not
     #               being written to disk.
-    run(["chroot", target_userspace, "/bin/bash", "-c", "su - -c update-ca-trust"])
+    #run(["chroot", target_userspace, "/bin/bash", "-c", "su - -c update-ca-trust"])
 
     if not rhsm.skip_rhsm():
         run(['rm', '-rf', os.path.join(target_etc, 'rhsm')])