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

This reverts commit a6b0e2a9c87506f77acafbca76c2dfd4846279c1.
Rebase from 'upstream'
Trimmed the branch to only the pr2_machine sub directory