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

This reverts commit 038a41dc2b3bc365f41897fae0076d62ab86af88.
Rebase from 'upstream'
Trimmed the branch to only the pr2_self_test sub directory