Update cinder options for icehouse with latest autohelp

Change-Id: I6ffe35eb2995c76f69ebccb2b5d9a6211b3ff6ce
Merge "Update cinder options for icehouse with latest autohelp"