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

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