Remove unnecessary braces, and re-indent code to match upstream.
Remove unnecessary braces, and re-indent code to match upstream.

xuegang/gpdb,edespino/gpdb,cjcjameson/gpdb,xuegang/gpdb,jmcatamney/gpdb,atris/gpdb,janebeckman/gpdb,zaksoup/gpdb,CraigHarris/gpdb,50wu/gpdb,Quikling/gpdb,tangp3/gpdb,edespino/gpdb,cjcjameson/gpdb,atris/gpdb,adam8157/gpdb,Chibin/gpdb,tangp3/gpdb,0x0FFF/gpdb,kaknikhil/gpdb,jmcatamney/gpdb,chrishajas/gpdb,lpetrov-pivotal/gpdb,jmcatamney/gpdb,randomtask1155/gpdb,rubikloud/gpdb,kaknikhil/gpdb,chrishajas/gpdb,xinzweb/gpdb,yuanzhao/gpdb,Quikling/gpdb,greenplum-db/gpdb,kaknikhil/gpdb,Chibin/gpdb,royc1/gpdb,Chibin/gpdb,ashwinstar/gpdb,janebeckman/gpdb,kaknikhil/gpdb,0x0FFF/gpdb,lpetrov-pivotal/gpdb,CraigHarris/gpdb,edespino/gpdb,0x0FFF/gpdb,edespino/gpdb,ahachete/gpdb,lisakowen/gpdb,cjcjameson/gpdb,lisakowen/gpdb,lpetrov-pivotal/gpdb,xinzweb/gpdb,zaksoup/gpdb,0x0FFF/gpdb,atris/gpdb,yuanzhao/gpdb,adam8157/gpdb,jmcatamney/gpdb,edespino/gpdb,Quikling/gpdb,ashwinstar/gpdb,greenplum-db/gpdb,chrishajas/gpdb,xinzweb/gpdb,50wu/gpdb,adam8157/gpdb,atris/gpdb,kaknikhil/gpdb,ahachete/gpdb,lisakowen/gpdb,xuegang/gpdb,cjcjameson/gpdb,tangp3/gpdb,xinzweb/gpdb,ahachete/gpdb,xinzweb/gpdb,xuegang/gpdb,jmcatamney/gpdb,rvs/gpdb,adam8157/gpdb,adam8157/gpdb,foyzur/gpdb,chrishajas/gpdb,royc1/gpdb,atris/gpdb,rvs/gpdb,lisakowen/gpdb,randomtask1155/gpdb,foyzur/gpdb,0x0FFF/gpdb,ahachete/gpdb,edespino/gpdb,yuanzhao/gpdb,lintzc/gpdb,rvs/gpdb,CraigHarris/gpdb,greenplum-db/gpdb,tangp3/gpdb,chrishajas/gpdb,lintzc/gpdb,50wu/gpdb,Quikling/gpdb,xinzweb/gpdb,jmcatamney/gpdb,yuanzhao/gpdb,zaksoup/gpdb,tangp3/gpdb,lintzc/gpdb,cjcjameson/gpdb,lisakowen/gpdb,ashwinstar/gpdb,rubikloud/gpdb,Quikling/gpdb,lisakowen/gpdb,ashwinstar/gpdb,edespino/gpdb,ashwinstar/gpdb,CraigHarris/gpdb,foyzur/gpdb,janebeckman/gpdb,janebeckman/gpdb,yuanzhao/gpdb,randomtask1155/gpdb,xinzweb/gpdb,Quikling/gpdb,CraigHarris/gpdb,adam8157/gpdb,kaknikhil/gpdb,rvs/gpdb,lisakowen/gpdb,lisakowen/gpdb,0x0FFF/gpdb,50wu/gpdb,greenplum-db/gpdb,rubikloud/gpdb,rubikloud/gpdb,xuegang/gpdb,zaksoup/gpdb,atris/gpdb,cjcjameson/gpdb,lintzc/gpdb,zaksoup/gpdb,foyzur/gpdb,rubikloud/gpdb,xuegang/gpdb,ashwinstar/gpdb,greenplum-db/gpdb,chrishajas/gpdb,rvs/gpdb,royc1/gpdb,xuegang/gpdb,lintzc/gpdb,lintzc/gpdb,janebeckman/gpdb,kaknikhil/gpdb,edespino/gpdb,Chibin/gpdb,janebeckman/gpdb,foyzur/gpdb,greenplum-db/gpdb,royc1/gpdb,yuanzhao/gpdb,Chibin/gpdb,greenplum-db/gpdb,rubikloud/gpdb,CraigHarris/gpdb,50wu/gpdb,lpetrov-pivotal/gpdb,ahachete/gpdb,yuanzhao/gpdb,tangp3/gpdb,xinzweb/gpdb,rvs/gpdb,xuegang/gpdb,zaksoup/gpdb,royc1/gpdb,lpetrov-pivotal/gpdb,lintzc/gpdb,cjcjameson/gpdb,ahachete/gpdb,royc1/gpdb,foyzur/gpdb,0x0FFF/gpdb,randomtask1155/gpdb,randomtask1155/gpdb,tangp3/gpdb,yuanzhao/gpdb,chrishajas/gpdb,janebeckman/gpdb,Chibin/gpdb,lpetrov-pivotal/gpdb,edespino/gpdb,cjcjameson/gpdb,Quikling/gpdb,chrishajas/gpdb,lintzc/gpdb,ashwinstar/gpdb,rvs/gpdb,Chibin/gpdb,foyzur/gpdb,royc1/gpdb,0x0FFF/gpdb,lpetrov-pivotal/gpdb,Chibin/gpdb,rvs/gpdb,atris/gpdb,adam8157/gpdb,lpetrov-pivotal/gpdb,rubikloud/gpdb,jmcatamney/gpdb,50wu/gpdb,kaknikhil/gpdb,tangp3/gpdb,adam8157/gpdb,rvs/gpdb,50wu/gpdb,ashwinstar/gpdb,Quikling/gpdb,cjcjameson/gpdb,edespino/gpdb,randomtask1155/gpdb,Chibin/gpdb,zaksoup/gpdb,foyzur/gpdb,Quikling/gpdb,cjcjameson/gpdb,randomtask1155/gpdb,janebeckman/gpdb,50wu/gpdb,kaknikhil/gpdb,janebeckman/gpdb,CraigHarris/gpdb,ahachete/gpdb,greenplum-db/gpdb,zaksoup/gpdb,janebeckman/gpdb,jmcatamney/gpdb,xuegang/gpdb,kaknikhil/gpdb,Quikling/gpdb,royc1/gpdb,Chibin/gpdb,yuanzhao/gpdb,rubikloud/gpdb,CraigHarris/gpdb,rvs/gpdb,CraigHarris/gpdb,atris/gpdb,randomtask1155/gpdb,lintzc/gpdb,ahachete/gpdb,yuanzhao/gpdb