minor bug fix in nova conf.
Merge remote-tracking branch 'upstream/master'