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

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