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

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