LPS-46537 Default to deploy to osgi/apps dir unless it's overridden in the module
LPS-40398 - Sites Admin portlet