Merge pull request #3411 from nmav/tmp-ocserv-fix-keyid