Merge "Fix run-tempest black/exclude var setting"