Merge r657354, r657459 from trunk:

configure: Don't reject libtool 2.x
PR 44817


Revert unintentional changes in r657354

Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@721832 13f79535-47bb-0310-9956-ffa450edef68