[Building Sakai] Recent fixes breaking 2.5.x

[Seth Theriault]

Seth Theriault wrote:

> Zhen Qian wrote:
> 
> > I have merged in two more JIRAs: 
> > 
> > http://jira.sakaiproject.org/browse/SAK-13390
> > http://jira.sakaiproject.org/browse/SAK-12523
> > 
> > Please let me know if you still observe any inconsistencies.
> 
> Thanks, we will test this locally.

OK, we tested and it's still broken. If you try and add a tool to 
"My Workspace", the site becomes unavailable.

This is confirmed on nightly2.

Seth