UP-4108 Changes to support CAS ClearPass in clustered uPortal environment
Fixes bug if all mktplce screenshot urls are bad

If all screenshot urls when invoked do not return
200 response codes for a portlet, the page will
no longer throw an exception.
MUMUP-895 : fix remove so that it doesn't refresh the page
MUMUP-895 : Adjust XSLT to actually check if you can remove a portlet
Merge pull request #337 from Jasig/noScreenshotsForYou

Address zero viable of multiple attempted screenshots bug.
MUMUP-897 : Added in disable search button after form submit
MUMUP-896 : Add 'add to favorites' to marketplace Go button menu

Conflicts:
	uportal-war/src/main/resources/properties/i18n/Messages.properties
	uportal-war/src/main/webapp/WEB-INF/jsp/Marketplace/portlet/entry.jsp
Merge pull request #338 from timlevett/remove_portlet_bugfix_master

UP-3950 : Remove portlet bugfix
Merge pull request #340 from timlevett/add_portlet_to_favorite_in_marketplace

MUMUP-896 : Add 'add to favorites' to marketplace Go button menu
CMSPLT-36 Add validation query to SimpleContentManager overlay
NOJIRA update SimpleContentPortlet to 1.0.9
UP-4067: Portlet Manager Summary and Review views. Update markup to bootstrap for Respondr and add css styles to support Universality.
[UP-4139] Remove the reset password portlet and move that functionality into the login portlet.

[UP-4139] Rollback some whitespace only changes.
Sets an image height for mktplace screenshots

This will prevent the page from bouncing up
and down when a portlet has screenshots with
different heights.
UP-4008 / IP:65: Reapplied Universality functionality to Respondr
UP-4008 / IP:65: Reapplied Universality functionality to Respondr
UP-4008 / IP:65: Reapplied Universality functionality to Respondr
Merge pull request #344 from Jasig/vertein_noBouncingImages

Sets an image height for mktplace screenshots
Merge pull request #342 from garyt/UP-4067_PortletManagerSummary

UP-4067: Portlet Manager Summary and Review views
IP-63 for tenant admins who only have one portlet type available, skip
select portlet type screen when registering new portlet.