Revert "Trimmed the branch to only the scitos_dashboard sub directory"

This reverts commit 53b1c4db7e772c35a25cefa61ff55e91a848e749.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the scitos_dashboard sub directory