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

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