buildbot ConfigUpgradeTests fix issues related to new strict dassert for optional fields