Revert "otter-common: Nuke Focal"

This reverts commit d85be6865a3ebdb2c6c858fb4c05dbb970afc3e5.