Merge "Stop testing deprecated command nova-manage instance_type"