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

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