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

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