Wip 2.1 misc backports ∂π

wip-2915-testprobe-watch-∂π
wip-2916-CTD-warning-∂π
wip-2928-log-postStop-failures-∂π