Refs #14827 EEA; upgrade buildout to 2.2.0