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

This reverts commit 768cfaa87f9494d24da564dce63b5430ecc95cfe.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rocon_console sub directory