Correct some inconsistencies in keylen/csr_keylen. Should fix csr generation errors mentioned on ticket #2820
Correct some inconsistencies in keylen/csr_keylen. Should fix csr generation errors mentioned on ticket #2820