Git merges in Moodle 3.5.7 by Jake Dallimore

commit 09325c5a80289ff39b687b36418364876e667c0d
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 26 Jun 2019 14:53:01 +0800
Tag:    v3.5.7

Merge branch 'MDL-65249-redis-catch-exception-after-retry-MOODLE_35_STABLE' of https://github.com/ilya-catalyst/moodle into MOODLE_35_STABLE


commit db72e5b94e136d8c542d6ab057a04354f4677c15
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 26 Jun 2019 13:27:55 +0800
Tag:    v3.5.7

Merge branch 'MDL-60978-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE