Move cinder to 8.0 branch