re-roll 3.2.x with jpeach's build-fix for OS X
Merge branch '3.2.x' of https://git-wip-us.apache.org/repos/asf/trafficserver into 3.2.x