Some changes needed by admin portlet and worker
Authored by: hamaloss 2012-05-18
Parent: [r82]
Child: [r84]