Revert "Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle"

This reverts commit 0e88fe02274f15b8ca8bfc1470a56b82f553d0d0, reversing
changes made to de62e57a9b8a535d661bd93a3c800bc5f83d5d30.
MDL-46834 dndupload: check course dndupload cap on course level
MDL-46572 behat: Select user dialogue is not visible in phantomjs
Revert "Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle"

This reverts commit 4b5fd6eb6d34b5c519d778a8d9c5c1a014146f54, reversing
changes made to a788aade7ce694b3f36c8e27295c60a5178c5b23.
MDL-46834 dndupload: check course dndupload cap on course level
MDL-46572 behat: escape user supplied strings in xpath
MDL-35468 cohorts: upload cohorts from csv file