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

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