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

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