SAK-23811 Fixed NPE on display of tools in original toolOrder.xml; also simplified related code


git-svn-id: https://source.sakaiproject.org/svn/site-manage/trunk@128030 66ffb92e-73f9-0310-93c1-f5514f145a0a