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

This reverts commit 085f9503fccb3515f55a4e6504d46d07995fccbc.
Rebase from 'upstream'
Trimmed the branch to only the pr2_calibration_controllers sub directory