Merge "[ODL] Fix odl deployment on separate node"