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

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