Fix issues with tenant specific scripts
Merge branch 'Navajo_issue_111' of github.com:Dexels/navajo into Navajo_issue_111