[TS-2314] - addressing code review comments from James Peach and Alan M Carroll
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver