Merge "Add ostestr tox jobs"