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

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