Merge branch 'cleanup/unify-guards-for-uggrid' into 'master'
Resolve "Unify guards for uggrid"
Closes #1043 (closed)
See merge request !2676 (merged)
(cherry picked from commit 56a0c660)
0e1233b4 [cleanup] Remove HAVE_UG, unify guards for ug grid