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

This reverts commit 58d08bfb4673d56d279746f272828a024ce8722b.
Rebase from 'upstream'
Trimmed the branch to only the scitos_dashboard sub directory