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

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