correct PR UP-3691 - class merged wasn't on a good package path org.esco... moved on org.jasig, also change all bean references
Fix error.jsp display on Mobile view when 'a portlet node is null' :  WARN [ajp-8009-2-guest] registry.PortletEntityRegistryImpl.[] 2013-06-05 10:52:00,342 - No layout node exists for id u33l1n8, no portlet entity will be returned.
ERROR [ajp-8009-2] web.ExceptionLoggingFilter.[] 2013-06-05 10:52:00,347 -
java.lang.NullPointerException
        at org.jasig.portal.url.MobileUrlNodeSyntaxHelper.getPortletForFolderName(MobileUrlNodeSyntaxHelper.java:145)
        at sun.reflect.GeneratedMethodAccessor513.invoke(Unknown Source)
        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
        at java.lang.reflect.Method.invoke(Method.java:597)
        at org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:319)
        at org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:183)
        at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:150)
        at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:90)
        at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:172)
        at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:202)
        at com.sun.proxy..getPortletForFolderName(Unknown Source)
        at org.jasig.portal.url.UrlSyntaxProviderImpl.getPortalRequestInfo(UrlSyntaxProviderImpl.java:388)
        at org.jasig.portal.url.UrlSyntaxProviderImpl.getCanonicalUrl(UrlSyntaxProviderImpl.java:825)
        at org.jasig.portal.url.UrlCanonicalizingFilter.doFilterInternal(UrlCanonicalizingFilter.java:71)
        at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:76)
        at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:346)
        at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:259)
        at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
        at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
        at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:70)
        at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:346)
        at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:259)
        at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
        at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
        at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:88)
        at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:76)
        at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
        at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
        at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:330)
        at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:118)
        at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:84)
        at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:342)
        at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:113)
        at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:342)
        at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:103)
        at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:342)
        at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:113)
        at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:342)
        at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:54)
        at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:342)
        at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:45)
.....
UP-3621:  Add a try/catch (with a WARN log) around obtaining the password from ClearPass so if that part fails, it won't sink the whole AuthN
UP-3621:  Also ask for the proxyTicket in try/catch, because that will also fail typically in local dev environments
NOJIRA add context.xml to Notification portlet
NOJIRA upgrade Notifications portlet to 2.0.3
NOJIRA enhance portlet worker thread not completing warning message
UP-3743 Improved error message for unhandled web exceptions
Upgraded maven-release-plugin to version 2.4.1
UP-3710 Fix create/update of quarter details

Only delete quarter details from DB if they have actually changed
UP-3712 Fix term detail to only delete/update if needed
UP-3711 Merge cache manages to allow replication messages

Conflicts:
	uportal-war/.gitignore
	uportal-war/src/main/resources/properties/ehcache.xml
UP-3713 Purge empty portal cookies
UP-3713 Fix broken unit test
UP-3713 log more info about portlet cookie expiration
UP-3713 Fix empty cookie expiration date calc
UP-3712 Fix term data import
UP-3738 Fix resourceId for delegate URLs
UP-3739 Fix config mode check for framework portlets
UP-3746 Analytics configuration UI

backbone based configuration UI for setting up google analytics properties
and dimensions

Conflicts:
	pom.xml
	uportal-war/.gitignore
	uportal-war/src/main/resources/layout/structure/columns/columns.xsl
	uportal-war/src/main/webapp/WEB-INF/portlet.xml
	uportal-war/src/test/java/org/jasig/portal/events/JpaAuditedPortalEventStoreTest.java