This is just to save a working copy, not really checkin stuff
Merge branch 'u/pgee/DM-1461' of git.lsstcorp.org:LSST/DMS/meas_base into u/pgee/DM-1461

Conflicts:
	include/lsst/meas/base/SdssShape.h
	src/SdssShape.cc