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

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