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

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