Remove lint introduced in previous commit.  Add include for keystore.h, remove unused variable.  Refs #100501
Remove lint introduced in previous commit.  Add include for keystore.h, remove unused variable.  Refs #100501

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