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

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