update cinder flags and tables

Change-Id: I028787290ed4f24c2bccab3a2d5565eade54f291
Merge "update cinder flags and tables"