Merge "Switch to stestr"