MDL-44148 portfolio: set_user_config usage fix

Amended user/portfolio.php's use of portfolio_plugin_base::set_user_config to be consistent with the API.
Merge branch 'MDL-44148-master' of git://github.com/jethac/moodle
Merge branch 'MDL-44416' of git://github.com/appalachianstate/moodle
MDL-44246 behat: New mod_quiz test when JS is disabled

Also including a modification in behat_question_base
to make the internal method work with both JS and non-JS.
Merge branch 'w12_MDL-44191_m27_mysql56' of git://github.com/skodak/moodle
MDL-44677 mod_scorm - do not update unchanged scorm_scoes_track data
MDL-42025 assignfeedback_editpdf: add behat tests
MDL-42025 behat: renamed deprecated method
MDL-42892 logging: Remove usage of logtable from can_delete_course
Merge branch 'MDL-38636-master' of git://github.com/roelmann/moodle
MDL-42892 logging: Refactor logstore_legacy to group all legacy related changes together
Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle
MDL-44653 mod_feedback - Include additional name fields using user_picture::fields()
MDL-41760 quiz_statistics : response analysis for first/last/all tries
MDL-44535 quiz_statistics : response analysis - limit tries counted
MDL-44075 quiz_statistics : Various coding style / phpdocs fixes
MDL-44141 Completion: System updates data during restore

The completion system has code which is supposed to prevent it
updating completion status while grades are being restored. This
code was a nasty hack and had not worked for some time. As a result
completion dates were restored incorrectly.

This commit implements a 'proper' way to find out if a restore is
currently running, replacing the previous hack.
Merge branch 'MDL-44328-M27' of git://github.com/lazydaisy/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
Merge branch 'MDL-41216' of https://github.com/nobelium/moodle
Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle

Conflicts:
	version.php