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

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