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

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