Fixed build problems caused by merge from next.
Fixed build problems caused by merge from next.

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