Manually cherry pick GridTool/TreeModel changes from gda-8.32
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git