SDAM: port over missed changes from master:
SDAM: port over missed changes from master:

- DEFAULT_SOCKET_TIMEOUT_MSEC name change (orig. jeromelebel)
- CDRIVER-489 fix (orig. bjori)
- CDRIVER-486 fix (orig. bjori)
- CDRIVER-508 fix (orig. hanumantmk)
- CDRIVER-485 fix (orig. bjori)
- misplaced variable declaration (orig. outcoldman)

derickr/mongo-c-driver,jmikola/mongo-c-driver,acmorrow/mongo-c-driver,bjori/mongo-c-driver,mschoenlaub/mongo-c-driver,ajdavis/mongo-c-driver,rcsanchez97/mongo-c-driver,u2yg/mongo-c-driver,ac000/mongo-c-driver,Convey-Compliance/mongo-c-driver,ksuarz/mongo-c-driver,acmorrow/mongo-c-driver,ksuarz/mongo-c-driver,jmikola/mongo-c-driver,rcsanchez97/mongo-c-driver,ajdavis/mongo-c-driver,malexzx/mongo-c-driver,jmikola/mongo-c-driver,christopherjwang/mongo-c-driver,derickr/mongo-c-driver,mschoenlaub/mongo-c-driver,beingmeta/mongo-c-driver,beingmeta/mongo-c-driver,Machyne/mongo-c-driver,Machyne/mongo-c-driver,Convey-Compliance/mongo-c-driver,Machyne/mongo-c-driver,beingmeta/mongo-c-driver,Convey-Compliance/mongo-c-driver,ac000/mongo-c-driver,jmikola/mongo-c-driver,ksuarz/mongo-c-driver,christopherjwang/mongo-c-driver,beingmeta/mongo-c-driver,Convey-Compliance/mongo-c-driver,acmorrow/mongo-c-driver,jmikola/mongo-c-driver,ajdavis/mongo-c-driver,mongodb/mongo-c-driver,remicollet/mongo-c-driver,rcsanchez97/mongo-c-driver,remicollet/mongo-c-driver,remicollet/mongo-c-driver,u2yg/mongo-c-driver,remicollet/mongo-c-driver,ajdavis/mongo-c-driver,bjori/mongo-c-driver,bjori/mongo-c-driver,u2yg/mongo-c-driver,rcsanchez97/mongo-c-driver,jmikola/mongo-c-driver,mongodb/mongo-c-driver,mongodb/mongo-c-driver,remicollet/mongo-c-driver,malexzx/mongo-c-driver,derickr/mongo-c-driver,derickr/mongo-c-driver,ac000/mongo-c-driver,ajdavis/mongo-c-driver,acmorrow/mongo-c-driver,mongodb/mongo-c-driver,bjori/mongo-c-driver,derickr/mongo-c-driver,bjori/mongo-c-driver,Machyne/mongo-c-driver,mongodb/mongo-c-driver,ajdavis/mongo-c-driver,ajdavis/mongo-c-driver,bjori/mongo-c-driver,rcsanchez97/mongo-c-driver,mongodb/mongo-c-driver,mongodb/mongo-c-driver,acmorrow/mongo-c-driver,remicollet/mongo-c-driver,rcsanchez97/mongo-c-driver,malexzx/mongo-c-driver,beingmeta/mongo-c-driver,beingmeta/mongo-c-driver,christopherjwang/mongo-c-driver,derickr/mongo-c-driver,derickr/mongo-c-driver,mschoenlaub/mongo-c-driver,remicollet/mongo-c-driver,acmorrow/mongo-c-driver,beingmeta/mongo-c-driver,bjori/mongo-c-driver,rcsanchez97/mongo-c-driver,Convey-Compliance/mongo-c-driver,malexzx/mongo-c-driver,jmikola/mongo-c-driver,acmorrow/mongo-c-driver,christopherjwang/mongo-c-driver,mschoenlaub/mongo-c-driver,ksuarz/mongo-c-driver,u2yg/mongo-c-driver,beingmeta/mongo-c-driver