diff --git a/lib/db/access.php b/lib/db/access.php
index 43285e3fa82..5e4c51cbe47 100644
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -188,10 +188,44 @@ $moodle_capabilities = array(
         'legacy' => array(
             'editingteacher' => CAP_ALLOW,
             'admin' => CAP_ALLOW
+<<<<<<< access.php
+        ),
+
+        'clonepermissionsfrom' =>  'moodle/site:restore'
+    ),
+
+<<<<<<< access.php
+    'moodle/backup:userinfo' => array(
+
+        'riskbitmask' => RISK_PERSONAL | RISK_CONFIG,
+
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_COURSE,
+        'legacy' => array(
+            'admin' => CAP_ALLOW
         )
     ),
 
+=======
+    'moodle/backup:userinfo' => array(
+
+        'riskbitmask' => RISK_PERSONAL,
+
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_COURSE,
+        'legacy' => array(
+            'admin' => CAP_ALLOW
+=======
+>>>>>>> 1.75.2.23
+        )
+    ),
+
+<<<<<<< access.php
+>>>>>>> 1.113
+    'moodle/site:restore' => array(
+=======
     'moodle/restore:createuser' => array(
+>>>>>>> 1.75.2.23
 
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
 
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 10cbe942bd5..c3183236753 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3194,7 +3194,7 @@ function xmldb_main_upgrade($oldversion=0) {
         }
 
         $message = get_string('upgrade197notice', 'admin');
-        if (empty($CFG->passwordmainsalt)) {
+        if (empty($CFG->passwordsaltmain)) {
             $docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
             $message .= "\n".get_string('upgrade197salt', 'admin', $docspath);
         }
@@ -3208,7 +3208,7 @@ function xmldb_main_upgrade($oldversion=0) {
     if ($result && $oldversion < 2007101561.02) {
         $messagesubject = s($SITE->shortname).': '.get_string('upgrade197noticesubject', 'admin');
         $message  = '<p>'.s($SITE->fullname).' ('.s($CFG->wwwroot).'):</p>'.get_string('upgrade197notice', 'admin');
-        if (empty($CFG->passwordmainsalt)) {
+        if (empty($CFG->passwordsaltmain)) {
             $docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
             $message .= "\n".get_string('upgrade197salt', 'admin', $docspath);
         }