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

This reverts commit 8b7b1f843990b1618563081efe1e3e1914b83717.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the scitos_docking sub directory