LPS-48169 Fix tests?

Hey @csierra, @migue, could you please review this PR?

I had to change part of your ComboServletStaticURLGeneratorTest but I'm not entirely sure how it should be. 

The problem in always adding the portlet id on the generated combo URL is that it breaks ComboServlet ( `getModulePortletId()`, `getResourcePath()` ) when portlet reference a portal resource.

Let me know if you have any questions.

Thanks!