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

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