Merge "lib/cinder: Align endpoint creation code"