Merge branch 'wip-mdl-31969' of git://github.com/rajeshtaneja/moodle

Conflicts:
	version.php
MDL-31969 Grader report - bump version for capabilities and settings.
MDL-38682 removed auto page type, created issue MDL-39045 to address this
Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle
Merge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle
MDL-38927 use role->localname to get real role name
Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle
MDL-26649 forms: added a calendar icon that will display the calendar pop-up when clicked rather than the select boxes triggering the event
Merge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle
Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle
MDL-38950 behat: File manager elements contextual menu

Modified to work with both file manager elements
and file/folder elements inside modal windows.
MDL-38950 behat: Step definition to add files from recent files repo
MDL-38950 behat: New tests

According to MDLQA-1765, a selected
file can be cancelled. Also adding
a test for repository_recent.
Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle
Merge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle
MDL-38938 behat: Step definition to add glossary entries
MDL-38938 behat: New test

According to MDLQA-38, a teacher can
choose whether to allow duplicate
entries in a glossary.
MDL-38887 block nav: reshifter module
Merge branch 'MDL-38792' of https://github.com/ppichet/moodle
MDL-39056 Use new version of API when fetching available updates info