Repair brain fade in commit b181a91981203f6ec9403115a2917bd3f9473707.
Repair brain fade in commit b181a91981203f6ec9403115a2917bd3f9473707.

The split between which things need to happen in the C-locale case and
which needed to happen in the locale-aware case was a few bricks short
of a load.  Try to fix that.

ashwinstar/gpdb,xinzweb/gpdb,ovr/postgres-xl,lisakowen/gpdb,yazun/postgres-xl,xinzweb/gpdb,ovr/postgres-xl,zeroae/postgres-xl,xinzweb/gpdb,techdragon/Postgres-XL,ovr/postgres-xl,pavanvd/postgres-xl,jmcatamney/gpdb,xinzweb/gpdb,techdragon/Postgres-XL,xinzweb/gpdb,jmcatamney/gpdb,greenplum-db/gpdb,Postgres-XL/Postgres-XL,xinzweb/gpdb,lisakowen/gpdb,adam8157/gpdb,yazun/postgres-xl,Postgres-XL/Postgres-XL,jmcatamney/gpdb,ashwinstar/gpdb,pavanvd/postgres-xl,greenplum-db/gpdb,ashwinstar/gpdb,xinzweb/gpdb,ashwinstar/gpdb,50wu/gpdb,greenplum-db/gpdb,xinzweb/gpdb,50wu/gpdb,pavanvd/postgres-xl,lisakowen/gpdb,jmcatamney/gpdb,yazun/postgres-xl,ashwinstar/gpdb,50wu/gpdb,50wu/gpdb,adam8157/gpdb,techdragon/Postgres-XL,lisakowen/gpdb,jmcatamney/gpdb,Postgres-XL/Postgres-XL,adam8157/gpdb,oberstet/postgres-xl,lisakowen/gpdb,lisakowen/gpdb,50wu/gpdb,50wu/gpdb,adam8157/gpdb,adam8157/gpdb,Postgres-XL/Postgres-XL,lisakowen/gpdb,oberstet/postgres-xl,ovr/postgres-xl,ashwinstar/gpdb,ashwinstar/gpdb,techdragon/Postgres-XL,jmcatamney/gpdb,oberstet/postgres-xl,zeroae/postgres-xl,ashwinstar/gpdb,adam8157/gpdb,jmcatamney/gpdb,oberstet/postgres-xl,techdragon/Postgres-XL,Postgres-XL/Postgres-XL,adam8157/gpdb,oberstet/postgres-xl,lisakowen/gpdb,50wu/gpdb,50wu/gpdb,greenplum-db/gpdb,zeroae/postgres-xl,zeroae/postgres-xl,pavanvd/postgres-xl,zeroae/postgres-xl,greenplum-db/gpdb,jmcatamney/gpdb,adam8157/gpdb,yazun/postgres-xl,ovr/postgres-xl,greenplum-db/gpdb,greenplum-db/gpdb,yazun/postgres-xl,greenplum-db/gpdb,pavanvd/postgres-xl