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

This reverts commit a91c7ecf75fa39610897c4e9ebdcb7f704df943d.
Rebase from 'upstream'
Trimmed the branch to only the rocon_master_info sub directory