Merge "Add cinder-manage to /usr/local/bin/"