WL-587 Don't lookup null users.

Anonymous users were generating null lookups to UDP.
WL-536 Output a warning at the top if the user has javascript disabled.

As this has been added to the site.vm template I believe it should appear
most of the time, whether the user is logged in or not. When appropriate,
this appears underneath the login links and above the site tabs.

Conflicts:
	portal-render-engine-impl/pack/src/webapp/vm/defaultskin/site.vm
WL-327 Keep the return URL for the tool redirect.

Conflicts:
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
	portal-render-engine-impl/pack/src/webapp/vm/defaultskin/site.vm
WL-55 Allow choice of login route.

Conflicts:
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/GalleryHandler.java
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/PDAHandler.java
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/PresenceHandler.java
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/ToolHandler.java
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/WorksiteHandler.java
WL-681 Display related systems links.

Conflicts:
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
	portal-render-engine-impl/pack/src/webapp/vm/defaultskin/site.vm
WL-724 Made 'Order Active Sites' appear in the My Active Sites drop-down.

This was changed from 'Customize Tabs'. Unfortunately, this slipped from
the work done on WL-533, but a case insensitive search revealed this to be
the last occurrence - honest!
WL-735 Make portal request favicon.ico

Conflicts:
	portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includeStandardHead.vm
WL-710 Make current site an active link.

This allows the user to reset the site.
When resetting a site forget about the page.

Conflicts:
	portal-render-engine-impl/pack/src/webapp/vm/defaultskin/includeTabs.vm
WL-630 Support using a site alias.

Conflicts:
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java
WL-822 WL-901 No username in header

WL-822 Display username when hovered on user.
WL-901 Remove username from portal header.

Conflicts:
	portal-render-engine-impl/pack/src/webapp/vm/defaultskin/site.vm
Fix for NPE when page title is null.
WL-879 Use hierarchy URLs when swapping roles.
WL-882 Add better alt and title attributes.

Conflicts:
	portal-render-engine-impl/pack/src/webapp/vm/defaultskin/site.vm
WL-956 Improve wording of roleswap.

Conflicts:
	portal-impl/impl/src/bundle/sitenav.properties
Switch directtool to use hierarchy tool urls.
WL-1621 Two factor authentication

Conflicts:
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
	portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/PageHandler.java
	portal-render-engine-impl/pack/src/webapp/vm/defaultskin/site.vm
WL-1745 Change padlock text.

WL-1621 This is part of the two factor authentication work.
Exclude broken tests.

Conflicts:
	portal-render-engine-impl/pack/pom.xml
WL-1944 Fix for portal not escaping returnUrl correctly.
WL-3158 Disable roleswap unless published

Roleswap doesn't work for unpublished sites so don't provide the option.