Merge "Migrate from testr to stestr"