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

This reverts commit d488eba8d0273a8fd34ca6dee8752d5df2efcfb4.
Rebase from 'upstream'
Trimmed the branch to only the rocon_uri sub directory