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

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