debug: cloud-init does not add sql string in the nova.conf.
Merge branch 'hpc-grizzly-2013.1.1' of ssh://github.com/usc-isi/nova into hpc-grizzly-2013.1.1