Merge r1561321 from trunk:

Maintain ordering but use OVERRIDE if enabled AND found

Reviewed/backported by: jim


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