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

This reverts commit 0831b2fd21c01191b93909f1bb97c3ea038053bb.
Rebase from 'upstream'
Trimmed the branch to only the rocon_app_manager sub directory