PortletRendererImplTest failing

failing.log

~/code/github_jasig/uPortal [master|⚑ 34] 

$ mvn clean test

...

Failed tests: 
  PortletRendererImplTest.doServeResourceCachedContentExpirationMethodTest:511 
Wanted but not invoked:
portletCacheControlService.cachePortletResourceOutput(
    portletWindowId,
    isA(org.jasig.portal.utils.web.PortletHttpServletRequestWrapper),
    org.jasig.portal.portlet.rendering.TestingCacheState@2cbab3d4,
    org.jasig.portal.portlet.container.cache.CachedPortletResourceData@15743a3d
);
-> at org.jasig.portal.portlet.rendering.PortletRendererImplTest.doServeResourceCachedContentExpirationMethodTest(PortletRendererImplTest.java:511)

However, there were other interactions with this mock:
-> at org.jasig.portal.portlet.rendering.PortletRendererImpl.doServeResource(PortletRendererImpl.java:537)
-> at org.jasig.portal.portlet.rendering.PortletRendererImpl.doServeResource(PortletRendererImpl.java:552)
-> at org.jasig.portal.portlet.rendering.PortletRendererImpl.doServeResource(PortletRendererImpl.java:615)

  PortletRendererImplTest.doServeResourceCachedContentValidationMethodNotModifiedInternalCacheExpiredTest:721 expected:<304> but was:<200>
  PortletRendererImplTest.doServeResourceCachedContentValidationMethodTest:549 array lengths differed, expected.length=20 actual.length=0
  PortletRendererImplTest.doServeResourceCachedContentValidationMethodNotModifiedTest:630 expected:<304> but was:<200>

Tests run: 495, Failures: 4, Errors: 0, Skipped: 5

[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO] 
[INFO] uPortal Parent .................................... SUCCESS [0.525s]
[INFO] uPortal DB ........................................ SUCCESS [0.024s]
[INFO] uPortal Search API ................................ SUCCESS [3.900s]
[INFO] uPortal Platform API .............................. SUCCESS [0.105s]
[INFO] uPortal WAR ....................................... FAILURE [2:23.750s]
[INFO] uPortal Portlets .................................. SKIPPED
...
[INFO] Bootstrap - Ant Tasks Dependencies ................ SKIPPED
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 2:30.047s
[INFO] Finished at: Tue Oct 28 10:34:15 CDT 2014
[INFO] Final Memory: 75M/840M
[INFO] ------------------------------------------------------------------------
...
~/code/github_jasig/uPortal [master|⚑ 34] 
$ 

revert_fixes.log

~/code/github_jasig/uPortal [try_reverting_UP-4264|⚑ 34] 
$ mvn clean test
...
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 2:33.470s
[INFO] Finished at: Tue Oct 28 10:44:27 CDT 2014
[INFO] Final Memory: 77M/935M
[INFO] ------------------------------------------------------------------------
~/code/github_jasig/uPortal [try_reverting_UP-4264|⚑ 34]