Pushed to Upstream: (Applies to master) Jar OSGi modules are packaged as War files, which is incorrect

This reverts commit b33f65e. OSGi modules with a portlet structure fail to deploy. This logic considers that those modules are deployed as wars, but they are actually deployed as jars.