Update config override files new default astrometry task

The default astrometry task used by CalibrateTask is now
AstrometryTask instead of ANetAstrometryTask. I changed
two config override files to compensate for this:

* processStack.py does not set astrometry.solver.calculateSip.
This was required, and the fix is to delete the line
because AstrometryTask will not try to fit SIP terms
if it does not fit a WCS)

* processCcd.py does not retarget to use AstrometryTask.
This was optional, since it does not change behavior,
but it simplifies the file.

config/processCcd.py

@@ -30,8 +30,6 @@
     config.calibrate.measurePsf.psfDeterminer.name = "pca"
 
 # Astrometry
-from lsst.meas.astrom import AstrometryTask
-config.calibrate.astrometry.retarget(AstrometryTask)
 config.calibrate.astrometry.refObjLoader.filterMap = {
     'B': 'g',
     'V': 'r',

config/processStack.py

@@ -20,7 +20,6 @@
 
 # Astrometry (just use meas_astrom since we just need to match, not solve)
 config.calibrate.astrometry.forceKnownWcs = True
-config.calibrate.astrometry.solver.calculateSip = False
 
 # Enable deblender
 config.measurement.doReplaceWithNoise = True