Merge "Remove kilo config flags from Tempest"