Ensure that ca override does not get lost#7219

shinrich merged 2 commits intoapache:masterapache/trafficserver:masterfrom

shinrich:fix-sni-ca-overrideshinrich/trafficserver:fix-sni-ca-overrideCopy head branch name to clipboard