[Building Sakai] Recent fixes breaking 2.5.x

[Seth Theriault]

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. In addition, I have noted your 
changes (across all 6 Jira issues) at:

http://confluence.sakaiproject.org/display/REL/Sakai+2.6.2+and+2.5.6+Jira+Candidates

so they can get into 2.5.6.

Just so everyone knows, this includes a new feature (SAK-7209) 
that was required to merge fixes for the original request 
(SAK-14390).

Seth