Merge the r1881958 group from trunk: * r1881958, 1882128 Restoring support for building with APR 1.4. Justification: Allow building on older distros such as CentOS 7. Votes: +1: brane, hartmannathan, julianfoad