TS-1937: Prevent assert on SSL forward proxy connect.
 TS-1936 Make traffic_logstats honor the log-directory as intended
Merged from master