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

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