Merge "Fix wrong import from six.moves to make openstackwatch workable"