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

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