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.