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

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