Merge "Switch to use stestr for unit tests directly"