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

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