SAK-41774 Site Info NPE during site import for a missing tool (#6899)
(cherry picked from commit 715eb8e0bab6c2117d496578889cf2a236f8e8ee)
Conflicts:
site-manage/site-manage-impl/impl/src/java/org/sakaiproject/sitemanage/impl/SiteManageServiceImpl.java