Merge "Fix tempest.conf generation"