KNL-1077 kernel mods from SAK-23587 to support macro expansion in resources

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