Resolve "Unify guards for uggrid" Closes #1043 See merge request !2676 (cherry picked from commit 56a0c660) 0e1233b4 [cleanup] Remove HAVE_UG, unify guards for ug grid