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

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