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

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