Revert "LPS-48313 Make it work whether I type "ant jar" or "ant war""

This reverts commit 9ccb2a77f98f64bdd52a593b04bac446cd141973.
Revert "LPS-48313 If you're an OSGi module and you have a portlet.xml, then we need to massage your web.xml"

This reverts commit ee55110de650c1b457d11dc77fa6df25338ddb17.
Revert "LPS-48313 Abstract out direct deploy logic to a smaller macrodefs that can be called independently. No logic changes."

This reverts commit 01044c6ff4159013e14d0fc3377b2eaed16b8371.
LPS-48313 Make it work whether I type "ant jar" or "ant war"
LPS-48313 If you're an OSGi module and you have a portlet.xml, then we need to massage your web.xml
LPS-48313 Abstract out direct deploy logic to a smaller macrodefs that can be called independently. No logic changes.
CLDSVCS-792 As a LCS customer  Iwant to be able to connect to LCS via a proxy server
CLDSVCS-792 Validator class is not visible when JSONWebServiceClient is used inside of ant targets
CLDSVCS-792 SF