[Building Sakai] Recent fixes breaking 2.5.x

[Seth Theriault]

Hello,

Recently fixes for:

http://jira.sakaiproject.org/browse/SAK-7209
http://jira.sakaiproject.org/browse/SAK-14385
http://jira.sakaiproject.org/browse/SAK-14390

were commited to the 2.5.x maintenance branch.

I deployed these locally and a Columbia tester reports:

> In the page "Edit tools" under "My Workspace", there is an 
> error "[missing key: sitesetupgeneric feat.other.tools]". I 
> can't add or delete any tool.

I confirmed this behavior on:

http://nightly2.sakaiproject.org:8081

In addition, I see errors in my local catalina.out and here:

http://nightly2.sakaiproject.org/logs/tomcat-maint/catalina.out

>From the JIRAs, it looks as though SAK-14385 is the source of the 
problem.

Seth