Merge "Fix devstack job: the dict name is devstack_local_conf"