Temporarily remove --enable-testutils from targets

The --enable-testutils mechanism was broken in the 9.3 merge, with
fixing it left as a FIXME. Remove the invocation of the option from
gpAux targets as they otherwise fail to compile the tree. This also
expands the comment of the FIXME to indicate that these should be
turned on again when fixed.
Reviewed-by: NJacob Champion <pchampion@pivotal.io>

gpAux/Makefile

@@ -447,7 +447,7 @@ devel : INSTLOC=$(DEVPATH)
 devel : CLIENTINSTLOC=$(CLIENTDEVPATH)
 devel : LOADERSINSTLOC=$(LOADERSDEVPATH)
 devel : GPPKGINSTLOC=$(GPPKGDEVPATH)
-devel : CONFIGFLAGS+= --enable-cassert --enable-debug --enable-testutils --enable-depend
+devel : CONFIGFLAGS+= --enable-cassert --enable-debug --enable-depend
 ifdef ENABLE_VPATH_BUILD
 devel : BUILDDIR=Debug
 devel : ISCONFIG=$(BUILDDIR)/GNUmakefile
@@ -482,7 +482,6 @@ dist_prof : INSTCFLAGS=$(PROFFLAGS)
 dist_prof : INSTLOC=$(DISTPATH)
 dist_prof : CLIENTINSTLOC=$(CLIENTDISTPATH)
 dist_prof : LOADERSINSTLOC=$(LOADERSDISTPATH)
-dist_prof : CONFIGFLAGS+= --enable-testutils
 ifdef ENABLE_VPATH_BUILD
 dist_prof : BUILDDIR=Release
 dist_prof : ISCONFIG=$(BUILDDIR)/GNUmakefile
@@ -495,7 +494,6 @@ endif
 
 dist_faultinj : CLIENTINSTLOC=$(CLIENTDISTPATH)
 dist_faultinj : LOADERSINSTLOC=$(LOADERSDISTPATH)
-dist_faultinj : CONFIGFLAGS+= --enable-testutils
 ifdef ENABLE_VPATH_BUILD
 dist_faultinj : BUILDDIR=Release
 dist_faultinj : ISCONFIG=$(BUILDDIR)/GNUmakefile

src/include/utils/palloc.h

@@ -55,7 +55,13 @@
 #define CDB_PALLOC_CALLER_ID
 */
 
-// GPDB_93_MERGE_FIXME: This mechanism got broken.
+/*
+ * GPDB_93_MERGE_FIXME: This mechanism got broken. If this is resurrected and
+ * and made working the --enable-testutils invocations should be readded to
+ * gpAux/Makefile. For reference to where, the commit adding this comment has
+ * the removal so reverting this will get us back where we were before the
+ * merge.
+ */
 #ifdef USE_ASSERT_CHECKING
 //#define CDB_PALLOC_TAGS
 #endif