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

This reverts commit fab74324f7f445c0a52c6758e6acb27fe2ecbbfd.
Rebase from 'upstream'
Trimmed the branch to only the rocon_remocon sub directory