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

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