Merge "Fix multinode mode for devstack"