Return a partly reduced result if there is a routing hint and no @x
Merge branch 'ccntlv' of github.com:cn-uofbasel/ccn-lite into ccntlv

Conflicts:
	ccnl-ext-nfnkrivine.c