Add several improvements for FarmWarDeployer.
Merged following revisions from /trunk.
includes r1467891, r1467893, r1468290, r1468311, r1469138, r1469144, r1469703, r1469708, r1470852, r1470859.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1471259 13f79535-47bb-0310-9956-ffa450edef68