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

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