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

This reverts commit 5930f54ff3217fb153519aa1a49ef7184aafddd0.
Rebase from 'upstream'
Trimmed the branch to only the pr2_controller_manager sub directory