make channel-discover optional for custom channels
make channel-discover optional for custom channels

tjyang/fpm,pskrz/fpm,josephfrazier/fpm,djhaskin987/merge-demo,josephfrazier/fpm,gearmover/fpm,wyaeld/fpm,sideci-sample/sideci-sample-fpm,virtkick/fpm,fetep/fpm,schatt/fpm,pskrz/fpm,schatt/fpm,sideci-sample/sideci-sample-fpm,linearregression/fpm,snailwalker/fpm,schatt/fpm,gearmover/fpm,linearregression/fpm,josephfrazier/fpm,josephfrazier/fpm,mildred/fpm,tjyang/fpm,gearmover/fpm,paul-krohn/fpm,doghrim/fpm,virtkick/fpm,Tapjoy/fpm,jerizm/fpm,godp1301/fpm,mildred/fpm,doghrim/fpm,elvido/fpm,vi4m/fpm,djhaskin987/merge-demo,mzaccari/fpm,snailwalker/fpm,hlawrenz/fpm,jerizm/fpm,rbramwell/fpm,wyaeld/fpm,joseph-onsip/fpm,fetep/fpm,rbramwell/fpm,hlawrenz/fpm,mzaccari/fpm,godp1301/fpm,tjyang/fpm,vi4m/fpm,doghrim/fpm,doghrim/fpm,snailwalker/fpm,virtkick/fpm,pskrz/fpm,jerizm/fpm,gearmover/fpm,vi4m/fpm,mzaccari/fpm,Tapjoy/fpm,cturra/fpm,joseph-onsip/fpm,djhaskin987/merge-demo,hlawrenz/fpm,tjyang/fpm,elvido/fpm,dischord01/fpm,cturra/fpm,elvido/fpm,schatt/fpm,cturra/fpm,vi4m/fpm,snailwalker/fpm,dischord01/fpm,Tapjoy/fpm,paul-krohn/fpm,dischord01/fpm,Tapjoy/fpm,mzaccari/fpm,paul-krohn/fpm,godp1301/fpm,mildred/fpm,godp1301/fpm,pskrz/fpm,wyaeld/fpm,paul-krohn/fpm,cturra/fpm,linearregression/fpm,linearregression/fpm,rbramwell/fpm,fetep/fpm,hlawrenz/fpm,rbramwell/fpm,mildred/fpm,virtkick/fpm,fetep/fpm,dischord01/fpm,joseph-onsip/fpm,joseph-onsip/fpm,elvido/fpm,wyaeld/fpm,jerizm/fpm,sideci-sample/sideci-sample-fpm