Merge "Replaced testr with stestr"