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

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