Merge "Add whitelist and blacklist file options to tempest run"