Merge pull request #4719 from nick-child-ibm/2.16-hashlen

Backport 2.16: pk.c: Ensure min hash_len in pk_hashlen_helper