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

This reverts commit e2d9b0e58fb0a4fce750b8dc4e29d19dd972f677.
Rebase from 'upstream'
Trimmed the branch to only the rocon_multimaster sub directory