Fixed overriding of chosen port with certain '-s x' position in relay and peek
Merge branch 'ccntlv' of https://github.com/cn-uofbasel/ccn-lite into ccntlv
fixed conflict