merged ccnl-ext-nfnkrivine.h into ccnl-ext-nfn.h