adding missing semicolon
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master' of https://github.com/Jasig/uPortal
Merge branch 'master' of https://github.com/Jasig/uPortal
Merge remote-tracking branch 'upstream/master'
UP-3557 Update to latest version of Pluto - 2.1.0-M3

Also fix pluto container config to correctly specify supported container properties
UP-3559 Ignore target lookup for ALL* targets
UP-3560 Enable caching in the default person directory configuration
UP-3561 Provide better default config for ldap connection pools
Revert "UP-3366 -2 : add feature hide.from.desktop, similar to hide.from.mobile : gives the possibility to display a portlet only on mobiles"

This reverts commit f68aeb0aba22e542c215249514bb5d07fa63f398.
Revert "UP-3554:  Allow non-local accounts to be edited in the User Manager"

This reverts commit f7a83b5efc60c774827d61c4397e530839259cf3.
UP-3564 Updating uPortal footer to use direct XSLT to generate the footer instead of relying on the sitemap portlet.  Also removing permissions for the sitemap portlet and removing that portlet from all fragment layouts.  This commit is intended to address timeout side effects currently being caused by the sitemap portlet
UP-2593 Simplifying user administrative search form