Merge r1561394 from trunk:

Okey dokey... how we gen the key isn't part of our ABI,
so we can fix it without breaking it.

Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1561395 13f79535-47bb-0310-9956-ffa450edef68