This fixes the errors detected by bashate (kicked by `tox -e bashate`), which has not been actually tested in CI. Change-Id: I73f0748e05b8421ca988d3e888e54a7daa469ae8