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

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