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

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