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

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