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

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