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

This reverts commit e0e35dd58f11e979bc85c34e9152429c37c0e978.
Rebase from 'upstream'
Trimmed the branch to only the pr2_hack_the_future sub directory