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

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