Merge "Fix tempest multisite config"