Revert "gpexpand: fix the template creation"
Revert "gpexpand: fix the template creation"

This reverts commit f91e2d8167e8df7640b3be643e6118f3a25e5fba.

50wu/gpdb,xinzweb/gpdb,50wu/gpdb,lisakowen/gpdb,jmcatamney/gpdb,50wu/gpdb,adam8157/gpdb,greenplum-db/gpdb,xinzweb/gpdb,50wu/gpdb,xinzweb/gpdb,greenplum-db/gpdb,adam8157/gpdb,lisakowen/gpdb,xinzweb/gpdb,jmcatamney/gpdb,xinzweb/gpdb,adam8157/gpdb,jmcatamney/gpdb,xinzweb/gpdb,lisakowen/gpdb,jmcatamney/gpdb,adam8157/gpdb,lisakowen/gpdb,50wu/gpdb,lisakowen/gpdb,greenplum-db/gpdb,greenplum-db/gpdb,jmcatamney/gpdb,lisakowen/gpdb,xinzweb/gpdb,50wu/gpdb,jmcatamney/gpdb,adam8157/gpdb,greenplum-db/gpdb,50wu/gpdb,adam8157/gpdb,lisakowen/gpdb,greenplum-db/gpdb,xinzweb/gpdb,jmcatamney/gpdb,lisakowen/gpdb,greenplum-db/gpdb,adam8157/gpdb,jmcatamney/gpdb,50wu/gpdb,adam8157/gpdb,greenplum-db/gpdb