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

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