Fixed merge conflict
Fixed merge conflict

pratikmallya/hue,cloudera/hue,xq262144/hue,MobinRanjbar/hue,azureplus/hue,lumig242/Hue-Integration-with-CDAP,fangxingli/hue,xq262144/hue,kawamon/hue,rahul67/hue,MobinRanjbar/hue,lumig242/Hue-Integration-with-CDAP,abhishek-ch/hue,ahmed-mahran/hue,GitHublong/hue,sanjeevtripurari/hue,Peddle/hue,erickt/hue,pwong-mapr/private-hue,rahul67/hue,jayceyxc/hue,kawamon/hue,xiangel/hue,erickt/hue,ahmed-mahran/hue,cloudera/hue,hdinsight/hue,azureplus/hue,x303597316/hue,erickt/hue,hdinsight/hue,kawamon/hue,xiangel/hue,cloudera/hue,hdinsight/hue,abhishek-ch/hue,kawamon/hue,kawamon/hue,vitan/hue,x303597316/hue,rahul67/hue,yongshengwang/hue,nvoron23/hue,GitHublong/hue,azureplus/hue,xiangel/hue,epssy/hue,azureplus/hue,GitHublong/hue,javachengwc/hue,erickt/hue,rahul67/hue,jayceyxc/hue,yoer/hue,sanjeevtripurari/hue,nvoron23/hue,yoer/hue,jayceyxc/hue,ahmed-mahran/hue,jjmleiro/hue,yongshengwang/hue,nvoron23/hue,fangxingli/hue,pwong-mapr/private-hue,erickt/hue,vitan/hue,GitHublong/hue,x303597316/hue,mapr/hue,xiangel/hue,abhishek-ch/hue,pratikmallya/hue,ChenJunor/hue,ahmed-mahran/hue,epssy/hue,javachengwc/hue,rahul67/hue,abhishek-ch/hue,pwong-mapr/private-hue,ChenJunor/hue,lumig242/Hue-Integration-with-CDAP,todaychi/hue,vitan/hue,vitan/hue,pratikmallya/hue,vitan/hue,todaychi/hue,MobinRanjbar/hue,sanjeevtripurari/hue,cloudera/hue,cloudera/hue,cloudera/hue,x303597316/hue,vmax-feihu/hue,yongshengwang/hue,cloudera/hue,yongshengwang/hue,jayceyxc/hue,azureplus/hue,MobinRanjbar/hue,jjmleiro/hue,sanjeevtripurari/hue,jayceyxc/hue,kawamon/hue,ChenJunor/hue,GitHublong/hue,kawamon/hue,epssy/hue,erickt/hue,abhishek-ch/hue,xq262144/hue,cloudera/hue,jayceyxc/hue,xq262144/hue,fangxingli/hue,lumig242/Hue-Integration-with-CDAP,dulems/hue,jounex/hue,GitHublong/hue,mapr/hue,jjmleiro/hue,MobinRanjbar/hue,yongshengwang/hue,Peddle/hue,fangxingli/hue,jjmleiro/hue,mapr/hue,jounex/hue,todaychi/hue,vmax-feihu/hue,kawamon/hue,lumig242/Hue-Integration-with-CDAP,yongshengwang/hue,fangxingli/hue,yoer/hue,vitan/hue,jounex/hue,cloudera/hue,mapr/hue,javachengwc/hue,epssy/hue,jjmleiro/hue,MobinRanjbar/hue,erickt/hue,ChenJunor/hue,yoer/hue,mapr/hue,ahmed-mahran/hue,Peddle/hue,vmax-feihu/hue,pratikmallya/hue,dulems/hue,GitHublong/hue,vmax-feihu/hue,x303597316/hue,dulems/hue,kawamon/hue,xiangel/hue,epssy/hue,pratikmallya/hue,kawamon/hue,cloudera/hue,sanjeevtripurari/hue,azureplus/hue,cloudera/hue,xq262144/hue,Peddle/hue,lumig242/Hue-Integration-with-CDAP,cloudera/hue,dulems/hue,vitan/hue,epssy/hue,abhishek-ch/hue,yoer/hue,vmax-feihu/hue,fangxingli/hue,todaychi/hue,nvoron23/hue,hdinsight/hue,vmax-feihu/hue,todaychi/hue,ChenJunor/hue,pratikmallya/hue,javachengwc/hue,lumig242/Hue-Integration-with-CDAP,abhishek-ch/hue,yongshengwang/hue,ChenJunor/hue,todaychi/hue,Peddle/hue,jounex/hue,jayceyxc/hue,yoer/hue,jjmleiro/hue,pwong-mapr/private-hue,pratikmallya/hue,ahmed-mahran/hue,ChenJunor/hue,rahul67/hue,todaychi/hue,mapr/hue,fangxingli/hue,ahmed-mahran/hue,Peddle/hue,nvoron23/hue,azureplus/hue,abhishek-ch/hue,dulems/hue,rahul67/hue,ahmed-mahran/hue,hdinsight/hue,dulems/hue,pwong-mapr/private-hue,jounex/hue,kawamon/hue,jounex/hue,javachengwc/hue,kawamon/hue,epssy/hue,xiangel/hue,nvoron23/hue,hdinsight/hue,xq262144/hue,yoer/hue,cloudera/hue,vitan/hue,jayceyxc/hue,todaychi/hue,kawamon/hue,Peddle/hue,cloudera/hue,vmax-feihu/hue,jounex/hue,jjmleiro/hue,kawamon/hue,ChenJunor/hue,MobinRanjbar/hue,nvoron23/hue,javachengwc/hue,kawamon/hue,hdinsight/hue,yoer/hue,mapr/hue,yongshengwang/hue,rahul67/hue,epssy/hue,x303597316/hue,xq262144/hue,hdinsight/hue,lumig242/Hue-Integration-with-CDAP,xiangel/hue,cloudera/hue,cloudera/hue,Peddle/hue,jayceyxc/hue,cloudera/hue,nvoron23/hue,xq262144/hue,x303597316/hue,vmax-feihu/hue,MobinRanjbar/hue,jounex/hue,kawamon/hue,cloudera/hue,jjmleiro/hue,pwong-mapr/private-hue,pratikmallya/hue,azureplus/hue,GitHublong/hue,xiangel/hue,lumig242/Hue-Integration-with-CDAP,javachengwc/hue,kawamon/hue,xq262144/hue,sanjeevtripurari/hue,fangxingli/hue,sanjeevtripurari/hue,sanjeevtripurari/hue,jjmleiro/hue,Peddle/hue,kawamon/hue,pwong-mapr/private-hue,javachengwc/hue,dulems/hue,todaychi/hue,dulems/hue,erickt/hue,x303597316/hue