Adapt CollecTor to changes in metrics-lib 2.3.0

This concerns changes necessary for legacy/trac#25523 (moved).