Took Scott's update from the master branch for this.

At the same time, now with debugging over, silenced the messages from
xAODEventAuxInfoCnv_v2.