Merge "PortalResourceInterceptor.java:fixed sonnar issue"