[v6r12] Correctly deleting useServerCertificate flag

and a bug fix and minor documentation