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

This reverts commit 56885d704608b25bbb3bbe966f26a706e6cfb81a.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rocon_master_info sub directory