Merge "Add enable_certificate_validation config option"