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

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