Update configuration file using tools/conf/generate_sample.sh
Fix test and code style.
Merge branch 'stable/havana' of github.com:cloudbau/cinder into stable/havana