Merge "Add WITH_JNI_TRACE_DATA to allow tracing of SSLSocket data"