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

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