Forward port TLS fixes from CMSSW_7_2_X.
Merge pull request #894 from ktf/forward-port-tls

Forward port TLS fixes from CMSSW_7_2_X.