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

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