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

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