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

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