Fixing conflicts of the merge of lossy/non-lossy fetch descriptor fix.

Signed-off-by: NGeorge Caragea <gcaragea@pivotal.io>

src/test/regress/greenplum_schedule

@@ -16,7 +16,7 @@
 #
 
 ignore: leastsquares
-test: opr_sanity_gp decode_expr bitmapscan case_gp limit_gp notin percentile naivebayes join_gp union_gp gpcopy
+test: opr_sanity_gp decode_expr bitmapscan bitmapscan_ao case_gp limit_gp notin percentile naivebayes join_gp union_gp gpcopy
 test: filter gpctas gpdist matrix toast sublink sirv_functions table_functions olap_setup
 
 test: dispatch

src/test/regress/output/aocs.source

@@ -68,7 +68,7 @@ ERROR:  compresstype can't be used with compresslevel 0
 -- orientation=column must be combined with appendonly=true
 CREATE TABLE tenk_aocs13 (like tenk_heap_for_aocs) with (orientation=column) distributed by(unique1);
 ERROR:  invalid option "orientation" for base relation. Only valid for Append Only relations
--------------------- 
+--------------------
 -- catalog checks
 --------------------
 -- check pg_appendonly