Fix bugs arising from joomla code #29922

issues arise from #959
[#30926] Beez5: Additional < in category list
[#30906] *Batch usage needs strict permissions
Merge pull request #1099 from wilsonge/crios2

Fix bugs arising from joomla code #29922
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x