Check for str or unicode for the cert/key fields
Merge branch 'bug/check_str_or_unicode' into develop