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

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