Refs #21326; pep8 cleanup of versions.py
Merge remote-tracking branch 'collective/master'