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

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