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

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