discoverd/client: merging default timeout, adding comment
discoverd/client: merging default timeout, adding comment

TribeMedia/flynn,mubassirhayat/flynn,TribeMedia/flynn,whouses/flynn,benbjohnson/flynn,flynn/flynn,Brandywine2161/flynn,jzila/flynn,schatt/flynn,lmars/flynn,rikur/flynn,supermario/flynn,pkdevbox/flynn,technosophos/flynn,Brandywine2161/flynn,josephglanville/flynn,shutej/flynn,tonicbupt/flynn,benbjohnson/flynn,tonicbupt/flynn,rikur/flynn,kgrz/flynn,supermario/flynn,TribeMedia/flynn,tonicbupt/flynn,arekkas/flynn,philiplb/flynn,schatt/flynn,josephglanville/flynn,josephglanville/flynn,lmars/flynn,jzila/flynn,lmars/flynn,felixrieseberg/flynn,clifff/flynn,justintung/flynn,benbjohnson/flynn,arekkas/flynn,pkdevbox/flynn,kgrz/flynn,Brandywine2161/flynn,shads196770/flynn,technosophos/flynn,GrimDerp/flynn,schatt/flynn,Brandywine2161/flynn,josephglanville/flynn,lmars/flynn,jzila/flynn,kgrz/flynn,mubassirhayat/flynn,pkdevbox/flynn,philiplb/flynn,arekkas/flynn,justintung/flynn,felixrieseberg/flynn,benbjohnson/flynn,shads196770/flynn,shads196770/flynn,kgrz/flynn,clifff/flynn,supermario/flynn,justintung/flynn,ozum/flynn,arekkas/flynn,schatt/flynn,flynn/flynn,ozum/flynn,whouses/flynn,supermario/flynn,Brandywine2161/flynn,lmars/flynn,tonicbupt/flynn,flynn/flynn,rikur/flynn,whouses/flynn,ozum/flynn,josephglanville/flynn,flynn/flynn,whouses/flynn,ozum/flynn,whouses/flynn,supermario/flynn,shads196770/flynn,clifff/flynn,philiplb/flynn,shads196770/flynn,felixrieseberg/flynn,felixrieseberg/flynn,GrimDerp/flynn,justintung/flynn,GrimDerp/flynn,pkdevbox/flynn,mubassirhayat/flynn,TribeMedia/flynn,pkdevbox/flynn,jzila/flynn,technosophos/flynn,shads196770/flynn,benbjohnson/flynn,GrimDerp/flynn,jzila/flynn,GrimDerp/flynn,ozum/flynn,flynn/flynn,philiplb/flynn,arekkas/flynn,whouses/flynn,GrimDerp/flynn,mubassirhayat/flynn,technosophos/flynn,Brandywine2161/flynn,benbjohnson/flynn,schatt/flynn,justintung/flynn,tonicbupt/flynn,ozum/flynn,pkdevbox/flynn,schatt/flynn,clifff/flynn,philiplb/flynn,TribeMedia/flynn,justintung/flynn,rikur/flynn,clifff/flynn,kgrz/flynn,kgrz/flynn,technosophos/flynn,josephglanville/flynn,TribeMedia/flynn,felixrieseberg/flynn,supermario/flynn,rikur/flynn,clifff/flynn,rikur/flynn,jzila/flynn