Merge "Consider current EAP TLS configurations as 'valid'" into klp-dev