Refs #3303 - Fix merge error in NodeInfo.scala