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

This reverts commit 7cd63ae8d672398875efac12ed02c4151fa7c9ed.
Rebase from 'upstream'
Trimmed the branch to only the rocon_tools sub directory