Peer and TLS server certificate list fix

Jira Issue: WP-1024