Merge remote-tracking branch 'core/master' into sync_core_oss

Author: Michael Fero

cpp-driver/src/ssl/ssl_no_impl.hpp

@@ -33,7 +33,7 @@ class NoSslSession : public SslSession {
 
 class NoSslContext : public SslContext {
 public:
-  virtual SslSession* create_session(const Address& address, const String& hostname);
+  virtual SslSession* create_session(const Address& address, const String& hostname, const String& sni_server_name);
 
   virtual CassError add_trusted_cert(const char* cert, size_t cert_length);
   virtual CassError set_cert(const char* cert, size_t cert_length);