Fix SERENGETI-1656
Limit cluster folder name search to within base serengeti root folder