refs #100772 Fix bad merge on C side uncovered by Michael
refs #100772 Fix bad merge on C side uncovered by Michael

svartika/ccnx,svartika/ccnx,cawka/ndnx,svartika/ccnx,cawka/ndnx,cawka/ndnx,svartika/ccnx,svartika/ccnx,cawka/ndnx,svartika/ccnx,svartika/ccnx,cawka/ndnx