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

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