Merge "Add cinder/upgrade tasks"