Merge "Add variable to set volume service version on tempest"