Cannot upgrade 6.1.0 to 6.1.1 after MBMessage verify with "Permissioned model is null"

When attempting to upgrade my 6.1.0 GA1 CE portal, I receive the following stack trace after/while processing messageboards.

I have looked at LPS-28948, but I removed my bookmarks without luck. http://issues.liferay.com/browse/LPS-28948

21:46:48,419 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.asset.model.AssetTag
21:46:48,643 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.dynamicdatamapping.model.DDMStructure
21:46:49,077 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.messageboards.model.MBMessage
21:46:49,611 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.asset.model.AssetTag
21:46:49,644 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.asset.model.AssetTag
21:46:49,717 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.asset.model.AssetTag
21:46:49,874 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.asset.model.AssetTag
21:46:49,965 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.blogs.model.BlogsEntry
21:46:50,522 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.messageboards.model.MBMessage
21:46:50,612 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.messageboards.model.MBMessage
21:46:50,792 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.messageboards.model.MBMessage
21:46:50,916 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.messageboards.model.MBMessage
21:46:51,100 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.messageboards.model.MBMessage
21:46:51,191 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.messageboards.model.MBMessage
21:46:51,877 INFO [pool-2-thread-1][VerifyResourcePermissions:147] Processed 100 resource permissions for com.liferay.portlet.messageboards.model.MBMessage
21:46:52,379 ERROR [pool-2-thread-1][MainServlet:217] com.liferay.portal.kernel.events.ActionException: com.liferay.portal.verify.VerifyException: com.liferay.portal.verify.VerifyException: java.lang.IllegalArgumentException: Permissioned model is null
com.liferay.portal.kernel.events.ActionException: com.liferay.portal.verify.VerifyException: com.liferay.portal.verify.VerifyException: java.lang.IllegalArgumentException: Permissioned model is null
at com.liferay.portal.events.StartupAction.run(StartupAction.java:58)
at com.liferay.portal.servlet.MainServlet.processStartupEvents(MainServlet.java:1306)
at com.liferay.portal.servlet.MainServlet.init(MainServlet.java:214)
at javax.servlet.GenericServlet.init(GenericServlet.java:160)
at org.apache.catalina.core.StandardWrapper.initServlet(StandardWrapper.java:1266)
at org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.java:1185)
at org.apache.catalina.core.StandardWrapper.load(StandardWrapper.java:1080)
at org.apache.catalina.core.StandardContext.loadOnStartup(StandardContext.java:5015)
at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5302)
at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:895)
at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:871)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:615)
at org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:649)
at org.apache.catalina.startup.HostConfig$DeployDescriptor.run(HostConfig.java:1585)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
at java.util.concurrent.FutureTask.run(FutureTask.java:138)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
at java.lang.Thread.run(Thread.java:662)
Caused by: com.liferay.portal.verify.VerifyException: com.liferay.portal.verify.VerifyException: java.lang.IllegalArgumentException: Permissioned model is null
at com.liferay.portal.verify.VerifyProcess.verify(VerifyProcess.java:87)
at com.liferay.portal.verify.VerifyProcessUtil._verifyProcess(VerifyProcessUtil.java:113)
at com.liferay.portal.verify.VerifyProcessUtil._verifyProcess(VerifyProcessUtil.java:78)
at com.liferay.portal.verify.VerifyProcessUtil.verifyProcess(VerifyProcessUtil.java:47)
at com.liferay.portal.events.StartupHelper.verifyProcess(StartupHelper.java:136)
at com.liferay.portal.events.StartupHelperUtil.verifyProcess(StartupHelperUtil.java:52)
at com.liferay.portal.tools.DBUpgrader.verify(DBUpgrader.java:210)
at com.liferay.portal.events.StartupAction.doRun(StartupAction.java:182)
at com.liferay.portal.events.StartupAction.run(StartupAction.java:52)
... 20 more
Caused by: com.liferay.portal.verify.VerifyException: java.lang.IllegalArgumentException: Permissioned model is null
at com.liferay.portal.verify.VerifyProcess.verify(VerifyProcess.java:87)
at com.liferay.portal.verify.VerifyProcess.verify(VerifyProcess.java:92)
at com.liferay.portal.verify.VerifyProcessSuite.doVerify(VerifyProcessSuite.java:47)
at com.liferay.portal.verify.VerifyProcess.verify(VerifyProcess.java:84)
... 28 more
Caused by: java.lang.IllegalArgumentException: Permissioned model is null
at com.liferay.portal.service.impl.ResourceLocalServiceImpl.addResources_6(ResourceLocalServiceImpl.java:989)
at com.liferay.portal.service.impl.ResourceLocalServiceImpl.addResources(ResourceLocalServiceImpl.java:883)
at com.liferay.portal.service.impl.ResourceLocalServiceImpl.addResources(ResourceLocalServiceImpl.java:158)
at sun.reflect.GeneratedMethodAccessor337.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at com.liferay.portal.spring.aop.ServiceBeanMethodInvocation.proceed(ServiceBeanMethodInvocation.java:122)
at com.liferay.portal.spring.transaction.TransactionInterceptor.invoke(TransactionInterceptor.java:71)
at com.liferay.portal.spring.aop.ServiceBeanMethodInvocation.proceed(ServiceBeanMethodInvocation.java:118)
at com.liferay.portal.spring.aop.ServiceBeanAopProxy.invoke(ServiceBeanAopProxy.java:211)
at $Proxy77.addResources(Unknown Source)
at com.liferay.portal.service.ResourceLocalServiceUtil.addResources(ResourceLocalServiceUtil.java:320)
at com.liferay.portal.verify.VerifyResourcePermissions.verifyModel(VerifyResourcePermissions.java:111)
at com.liferay.portal.verify.VerifyResourcePermissions.verifyModel(VerifyResourcePermissions.java:173)
at com.liferay.portal.verify.VerifyResourcePermissions.doVerify(VerifyResourcePermissions.java:86)
at com.liferay.portal.verify.VerifyProcess.verify(VerifyProcess.java:84)
... 31 more
Stopping the server due to unexpected startup errors