Merge "Fix compilation failure because of changes in ndn-cxx library"