Merged in work for TclTLS 1.7 to trunk