Modified UserInfoUrlParameterizingPreInterceptor to recognise and replace tokens even where no value is available,
to match requirements for University of Edinburgh.
Added additional user attributes to portlet.xml