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

This reverts commit b4955c6e36c305217a4ee2efb48c5602976f8bb5.
Rebase from 'upstream'
Trimmed the branch to only the rocon_console sub directory