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

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