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

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