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

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