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

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