ARMORY-147 - TiaB causes some armoryd tests in pytest to fail

Initial check-in. This should make TiaB happy but I'm unable to test on
Linux.