Merge pull request #4718 from nick-child-ibm/hash_len_devel

Backport 2.x: pk.c: Ensure min hash_len in pk_hashlen_helper