LAI-5 updated code to work with new Sakai trunk portal changes