APG-240 merging back in trunk
APG-240 merging two heads
NXP-5296: add ids to jsf components for easier funkload testing
NXP-5260: add javascript tooltip for help labels
NXP-5299: use a generic content view template to render document views
Better error messages on file upload (NXP-5427)
NXP-5299: migrate orderable folders to content views: remove now useless templates
merge trunk into branch
NXP-5300: adapt search templates to content views
NXP-5466: search on path is not bound to the advanced search any more
NXP-5300: adapt search templates to content views
NXP-5300: make it possible to display error message when a provider query fails
NXP-5300: add deprecation markers on old search beans
NXP-5300: make it possible to display error message when a provider query fails
NXP-5300: fix typo
NXP-5525 - user local should be use even when not redirecting to domain views
Remove class that's been deprecated and marked for removal long time ago.
Format / cleanup.
NXP-5565: faceted Search styles
NXP-5574: style all the changes required by the new locations and labels