Git commits in Moodle 3.3.x by Nick Phillips

commit 7d5efd643cc3bada2c52fc8fec6e64af47d865e8
Author: Nick Phillips <nick.phillips@otago.ac.nz>
Date:   Tue, 17 Oct 2017 06:46:11 +0800
Tag:    v3.3.5

MDL-56688 grade: fix ordering of grade items in grade_seq::flatten


commit be17ced74793c8553c3d93fba3cd1ff37f6087ea
Author: Nick Phillips <nick.phillips@otago.ac.nz>
Date:   Mon, 15 May 2017 07:55:49 +0800
Tag:    v3.3.6

MDL-55532 gradebook: fix grade export to include category names