Refs #21515 - Display also archived (expired) versions of object
Merge remote-tracking branch 'collective/master'