KNL-1162 SAK-26088 fixes for the circular dependency issue in service startup (via lazy loading), see ticket for more details

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