Resolve remaining diffs in CCNNetworkManager.java with Paul's 100078-tcp  refs #100078
Resolve remaining diffs in CCNNetworkManager.java with Paul's 100078-tcp  refs #100078

Ignoring whitespace, that is.  That still needs fixing.

ebollens/ccnmp,cawka/ndnx,cawka/ndnx,ebollens/ccnmp,svartika/ccnx,svartika/ccnx,cawka/ndnx,svartika/ccnx,ebollens/ccnmp,svartika/ccnx,svartika/ccnx,svartika/ccnx,ebollens/ccnmp,cawka/ndnx,svartika/ccnx,cawka/ndnx