Merge branch 'dev' of https://github.com/USGS-Astrogeology/CSM-CameraModel into dev