Reintroduce checks for non-blocking in merge iterator test.
Reintroduce checks for non-blocking in merge iterator test.

Fixes #483, also undoes the 08eb21056a10d690fb5b4e95c2d279153adf23e9.

robertjpayne/rethinkdb,Wilbeibi/rethinkdb,sbusso/rethinkdb,jmptrader/rethinkdb,sbusso/rethinkdb,JackieXie168/rethinkdb,AntouanK/rethinkdb,catroot/rethinkdb,Wilbeibi/rethinkdb,niieani/rethinkdb,JackieXie168/rethinkdb,AtnNn/rethinkdb,RubenKelevra/rethinkdb,matthaywardwebdesign/rethinkdb,grandquista/rethinkdb,Wilbeibi/rethinkdb,Qinusty/rethinkdb,sontek/rethinkdb,greyhwndz/rethinkdb,spblightadv/rethinkdb,gdi2290/rethinkdb,victorbriz/rethinkdb,greyhwndz/rethinkdb,captainpete/rethinkdb,niieani/rethinkdb,ayumilong/rethinkdb,marshall007/rethinkdb,mbroadst/rethinkdb,urandu/rethinkdb,scripni/rethinkdb,nviennot/rethinkdb,catroot/rethinkdb,yaolinz/rethinkdb,pap/rethinkdb,gdi2290/rethinkdb,JackieXie168/rethinkdb,mcanthony/rethinkdb,losywee/rethinkdb,victorbriz/rethinkdb,ajose01/rethinkdb,RubenKelevra/rethinkdb,urandu/rethinkdb,mcanthony/rethinkdb,ajose01/rethinkdb,yakovenkodenis/rethinkdb,robertjpayne/rethinkdb,alash3al/rethinkdb,sebadiaz/rethinkdb,mbroadst/rethinkdb,greyhwndz/rethinkdb,RubenKelevra/rethinkdb,bchavez/rethinkdb,gavioto/rethinkdb,bpradipt/rethinkdb,jfriedly/rethinkdb,ajose01/rethinkdb,JackieXie168/rethinkdb,gdi2290/rethinkdb,wujf/rethinkdb,AntouanK/rethinkdb,sebadiaz/rethinkdb,rrampage/rethinkdb,sebadiaz/rethinkdb,matthaywardwebdesign/rethinkdb,spblightadv/rethinkdb,victorbriz/rethinkdb,victorbriz/rethinkdb,pap/rethinkdb,dparnell/rethinkdb,greyhwndz/rethinkdb,jmptrader/rethinkdb,KSanthanam/rethinkdb,victorbriz/rethinkdb,marshall007/rethinkdb,yaolinz/rethinkdb,bchavez/rethinkdb,bchavez/rethinkdb,KSanthanam/rethinkdb,mquandalle/rethinkdb,alash3al/rethinkdb,grandquista/rethinkdb,yaolinz/rethinkdb,sebadiaz/rethinkdb,AntouanK/rethinkdb,yaolinz/rethinkdb,KSanthanam/rethinkdb,spblightadv/rethinkdb,AntouanK/rethinkdb,catroot/rethinkdb,lenstr/rethinkdb,Wilbeibi/rethinkdb,RubenKelevra/rethinkdb,elkingtonmcb/rethinkdb,mquandalle/rethinkdb,niieani/rethinkdb,rrampage/rethinkdb,4talesa/rethinkdb,greyhwndz/rethinkdb,scripni/rethinkdb,mcanthony/rethinkdb,niieani/rethinkdb,wujf/rethinkdb,ayumilong/rethinkdb,KSanthanam/rethinkdb,sbusso/rethinkdb,jmptrader/rethinkdb,ajose01/rethinkdb,mbroadst/rethinkdb,lenstr/rethinkdb,Qinusty/rethinkdb,jesseditson/rethinkdb,gdi2290/rethinkdb,captainpete/rethinkdb,jesseditson/rethinkdb,lenstr/rethinkdb,spblightadv/rethinkdb,mbroadst/rethinkdb,rrampage/rethinkdb,sbusso/rethinkdb,yaolinz/rethinkdb,grandquista/rethinkdb,catroot/rethinkdb,eliangidoni/rethinkdb,urandu/rethinkdb,dparnell/rethinkdb,alash3al/rethinkdb,tempbottle/rethinkdb,jfriedly/rethinkdb,elkingtonmcb/rethinkdb,elkingtonmcb/rethinkdb,bpradipt/rethinkdb,JackieXie168/rethinkdb,greyhwndz/rethinkdb,RubenKelevra/rethinkdb,grandquista/rethinkdb,tempbottle/rethinkdb,tempbottle/rethinkdb,sbusso/rethinkdb,bpradipt/rethinkdb,catroot/rethinkdb,mbroadst/rethinkdb,spblightadv/rethinkdb,urandu/rethinkdb,Wilbeibi/rethinkdb,marshall007/rethinkdb,RubenKelevra/rethinkdb,eliangidoni/rethinkdb,elkingtonmcb/rethinkdb,bchavez/rethinkdb,elkingtonmcb/rethinkdb,nviennot/rethinkdb,wojons/rethinkdb,sontek/rethinkdb,jfriedly/rethinkdb,AntouanK/rethinkdb,gavioto/rethinkdb,urandu/rethinkdb,jesseditson/rethinkdb,jfriedly/rethinkdb,eliangidoni/rethinkdb,sontek/rethinkdb,wojons/rethinkdb,ayumilong/rethinkdb,scripni/rethinkdb,yaolinz/rethinkdb,elkingtonmcb/rethinkdb,yakovenkodenis/rethinkdb,AtnNn/rethinkdb,ayumilong/rethinkdb,jmptrader/rethinkdb,alash3al/rethinkdb,wojons/rethinkdb,marshall007/rethinkdb,scripni/rethinkdb,pap/rethinkdb,yakovenkodenis/rethinkdb,elkingtonmcb/rethinkdb,gdi2290/rethinkdb,tempbottle/rethinkdb,Qinusty/rethinkdb,4talesa/rethinkdb,Qinusty/rethinkdb,robertjpayne/rethinkdb,elkingtonmcb/rethinkdb,urandu/rethinkdb,spblightadv/rethinkdb,matthaywardwebdesign/rethinkdb,Qinusty/rethinkdb,sontek/rethinkdb,dparnell/rethinkdb,ajose01/rethinkdb,mquandalle/rethinkdb,bpradipt/rethinkdb,4talesa/rethinkdb,nviennot/rethinkdb,wujf/rethinkdb,sebadiaz/rethinkdb,JackieXie168/rethinkdb,marshall007/rethinkdb,captainpete/rethinkdb,matthaywardwebdesign/rethinkdb,gdi2290/rethinkdb,rrampage/rethinkdb,bchavez/rethinkdb,gavioto/rethinkdb,AtnNn/rethinkdb,mcanthony/rethinkdb,gavioto/rethinkdb,victorbriz/rethinkdb,jfriedly/rethinkdb,grandquista/rethinkdb,dparnell/rethinkdb,tempbottle/rethinkdb,victorbriz/rethinkdb,urandu/rethinkdb,alash3al/rethinkdb,robertjpayne/rethinkdb,mcanthony/rethinkdb,bchavez/rethinkdb,matthaywardwebdesign/rethinkdb,sbusso/rethinkdb,bpradipt/rethinkdb,wujf/rethinkdb,bchavez/rethinkdb,wkennington/rethinkdb,robertjpayne/rethinkdb,Qinusty/rethinkdb,KSanthanam/rethinkdb,AtnNn/rethinkdb,sebadiaz/rethinkdb,Wilbeibi/rethinkdb,ajose01/rethinkdb,wojons/rethinkdb,matthaywardwebdesign/rethinkdb,eliangidoni/rethinkdb,mbroadst/rethinkdb,wkennington/rethinkdb,marshall007/rethinkdb,wujf/rethinkdb,lenstr/rethinkdb,gavioto/rethinkdb,niieani/rethinkdb,victorbriz/rethinkdb,wojons/rethinkdb,pap/rethinkdb,scripni/rethinkdb,greyhwndz/rethinkdb,yakovenkodenis/rethinkdb,KSanthanam/rethinkdb,dparnell/rethinkdb,urandu/rethinkdb,jfriedly/rethinkdb,gavioto/rethinkdb,eliangidoni/rethinkdb,alash3al/rethinkdb,lenstr/rethinkdb,captainpete/rethinkdb,lenstr/rethinkdb,sbusso/rethinkdb,jmptrader/rethinkdb,bpradipt/rethinkdb,sebadiaz/rethinkdb,niieani/rethinkdb,gavioto/rethinkdb,AtnNn/rethinkdb,grandquista/rethinkdb,catroot/rethinkdb,bpradipt/rethinkdb,yaolinz/rethinkdb,bpradipt/rethinkdb,greyhwndz/rethinkdb,captainpete/rethinkdb,yaolinz/rethinkdb,losywee/rethinkdb,nviennot/rethinkdb,Qinusty/rethinkdb,wkennington/rethinkdb,jesseditson/rethinkdb,marshall007/rethinkdb,KSanthanam/rethinkdb,dparnell/rethinkdb,sebadiaz/rethinkdb,pap/rethinkdb,nviennot/rethinkdb,captainpete/rethinkdb,ajose01/rethinkdb,ayumilong/rethinkdb,grandquista/rethinkdb,sontek/rethinkdb,nviennot/rethinkdb,mcanthony/rethinkdb,4talesa/rethinkdb,ajose01/rethinkdb,JackieXie168/rethinkdb,tempbottle/rethinkdb,gavioto/rethinkdb,captainpete/rethinkdb,mquandalle/rethinkdb,losywee/rethinkdb,JackieXie168/rethinkdb,rrampage/rethinkdb,wujf/rethinkdb,niieani/rethinkdb,eliangidoni/rethinkdb,AtnNn/rethinkdb,mquandalle/rethinkdb,robertjpayne/rethinkdb,losywee/rethinkdb,sontek/rethinkdb,jesseditson/rethinkdb,nviennot/rethinkdb,alash3al/rethinkdb,ayumilong/rethinkdb,wojons/rethinkdb,mcanthony/rethinkdb,grandquista/rethinkdb,sontek/rethinkdb,4talesa/rethinkdb,spblightadv/rethinkdb,nviennot/rethinkdb,lenstr/rethinkdb,Wilbeibi/rethinkdb,ayumilong/rethinkdb,losywee/rethinkdb,bchavez/rethinkdb,AtnNn/rethinkdb,jfriedly/rethinkdb,JackieXie168/rethinkdb,pap/rethinkdb,sontek/rethinkdb,grandquista/rethinkdb,losywee/rethinkdb,yakovenkodenis/rethinkdb,mquandalle/rethinkdb,matthaywardwebdesign/rethinkdb,matthaywardwebdesign/rethinkdb,catroot/rethinkdb,rrampage/rethinkdb,RubenKelevra/rethinkdb,yakovenkodenis/rethinkdb,tempbottle/rethinkdb,eliangidoni/rethinkdb,dparnell/rethinkdb,jesseditson/rethinkdb,wkennington/rethinkdb,4talesa/rethinkdb,captainpete/rethinkdb,KSanthanam/rethinkdb,wojons/rethinkdb,spblightadv/rethinkdb,losywee/rethinkdb,wujf/rethinkdb,bpradipt/rethinkdb,niieani/rethinkdb,robertjpayne/rethinkdb,AntouanK/rethinkdb,mbroadst/rethinkdb,pap/rethinkdb,AntouanK/rethinkdb,rrampage/rethinkdb,scripni/rethinkdb,AtnNn/rethinkdb,4talesa/rethinkdb,marshall007/rethinkdb,catroot/rethinkdb,yakovenkodenis/rethinkdb,rrampage/rethinkdb,wkennington/rethinkdb,Wilbeibi/rethinkdb,RubenKelevra/rethinkdb,pap/rethinkdb,jesseditson/rethinkdb,sbusso/rethinkdb,robertjpayne/rethinkdb,lenstr/rethinkdb,alash3al/rethinkdb,mbroadst/rethinkdb,wkennington/rethinkdb,jmptrader/rethinkdb,Qinusty/rethinkdb,robertjpayne/rethinkdb,mquandalle/rethinkdb,4talesa/rethinkdb,mquandalle/rethinkdb,mcanthony/rethinkdb,yakovenkodenis/rethinkdb,eliangidoni/rethinkdb,dparnell/rethinkdb,scripni/rethinkdb,Qinusty/rethinkdb,jmptrader/rethinkdb,mbroadst/rethinkdb,gdi2290/rethinkdb,eliangidoni/rethinkdb,wkennington/rethinkdb,bchavez/rethinkdb,tempbottle/rethinkdb,losywee/rethinkdb,jmptrader/rethinkdb,jfriedly/rethinkdb,wojons/rethinkdb,scripni/rethinkdb,ayumilong/rethinkdb,dparnell/rethinkdb,AntouanK/rethinkdb,jesseditson/rethinkdb,wkennington/rethinkdb