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

This reverts commit d5dc711b17d7d0854e2babda5b43a0371e1d5d78.
Rebase from 'upstream' @ version '1.9.12'
Trimmed the branch to only the camera_calibration sub directory