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

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