Merge "Add --combine option to tempest run"