Marketplace infinite recursion fix and re-packaging

* Fixes infinite recursion issue in `MarketplacePortletDefinition` `getTimeout()` and `getRenderTimeout()`.
* Re-packages non-portlet-specific guts of Marketplace into the uPortal portlet container.
* Re-packages portlet-specific JSPs in Marketplace to a portlet name spaced JSP directory.

These are changes harvested from a feature branch about introducing a Servlet view on Marketplace (towards goals of Google-indexability, etc.)  The Servlet view isn't sufficiently baked for merge to master, but this change set ensures that `master` / what will be uPortal 4.1 is name spaced to accommodate that feature when it is available and brings in the trivial infinite recursion fix soonest.

Some whitespace changes crept into this changeset.  Some of them zap tab characters, so that's cool -- some of them are noise, which is less cool, but it's small enough noise that the pull should still be easily reviewable.