Fixup bad merge of the use_nova_config_drive change