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

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