Updated cinder module

Change-Id: Ibe885a5acca28a60707ec04d2d40db33b448ad00
Merge "Updated cinder module" into folsom