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 bc01650dd5e40052e04ede90577e4a3945f2bf9a.
Revert "LPS-48313 Abstract out direct deploy logic to a smaller macrodefs that can be called independently. No logic changes."

This reverts commit 9eb8ec19506000d799f1b39dc528a0c9452bd13d.