Always removing the UseServerCertificate flag before leaving
Merge pull request #2196 from fstagni/fixCSUseServerCertificateForPilots

[v6r12] Always removing the UseServerCertificate flag before leaving