Fix glanceclient usage inconsistences for options

Enumerated options should have the same format for all enumerated options.

This commit moves all options to the {option1,option2} format.

fixes bug: #1155171

Change-Id: I8e0ecf3896c76021cb027cbbbb3b5564a04aacec