cnetcombinept now merges control points correctly, sets control measures types...

cnetcombinept now merges control points correctly, sets control measures types to candidate correctly, and sets a priori lat/lon correctly to adjusted values.  Fixes #4870,4772,4869.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7814 41f8697f-d340-4b68-9986-7bafba869bb8