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

This reverts commit 82bef25e12f8782c9cddb9965bd03063f8d20913.
Rebase from 'upstream'
Trimmed the branch to only the scitos_docking sub directory