I have looked more into
BIGTOP-950 and BIGTOP-835.
It seems that the timeout functionality is completely unused in the current Bigtop. So, being badly implemented in the first place, an attempt to fix it -
BIGTOP-950 - actually just restored the original behavior that has existed since 2011.
Considering all this, I would remove the following SHAs
because fixing non-used code doesn't make any sense.