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

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