This is a place for me to remember which commits need merging, whilst still letting me close the bugs I've fixed on 2.5.5
Needs merging:
42771 - CONF-8864 42834, 42852 - CONF-8860 43053 - CONF-8868 43054 - CONF-8851