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

This reverts commit 78464972d81986eb9df6c491b3c1315ebf51ef57.
Rebase from 'upstream'
Trimmed the branch to only the rocon_apps sub directory