Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle

diff --cc config-dist.php
Simple merge

diff --cc lib/behat/lib.php
Simple merge

diff --cc lib/setup.php
Simple merge

diff --cc lib/setuplib.php
Simple merge