Update six support in cloud roster