Merge "Fix baremetal node property keys"