various fixes from ODIS v1.1.8 deployment#8309

mergify[bot] merged 2 commits into

mastercelo-org/celo-monorepo:masterfrom

alecps/odis8testscelo-org/celo-monorepo:alecps/odis8testsCopy head branch name to clipboard