Git commits in Moodle 3.3.5 by Adam Olley

commit 6837f2f6981db7179e9f3c2b4e5a45e4528b4935
Author: Adam Olley <adam.olley@blackboard.com>
Date:   Tue, 28 Nov 2017 13:34:23 +0800
Tag:    v3.3.5

MDL-60918 core_message: update preferences of user behat test