Fixed build problems after merge from next into sam_clanggtest.
Fixed build problems after merge from next into sam_clanggtest.

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