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

This reverts commit 500ea867a10690e38a6cf853006557109997eeea.
Rebase from 'upstream'
Trimmed the branch to only the rocon_test sub directory