ACCUMULO-3318 Update thrift RPC secure socket creation to default to TLS
Merge branch '1.6'