Merge "Make CLI timeout tests configurable"