new cinder.conf.sample and fix extract_opts.py

Fixes bug: #1167329

Change-Id: I09ce8f00c84a5a04d6e4274914fed102f19381e1
Merge "new cinder.conf.sample and fix extract_opts.py"