Maintain ordering but use OVERRIDE if enabled AND found


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1561321 13f79535-47bb-0310-9956-ffa450edef68