Change to GridTools GridPreferences handling for SCI-1244
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git