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

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