UT for agent/diag, agent/services
Merge remote branch 'upstream/master'
Merge pull request #272 from haripk/master

Some UT additions / update for diag, services & pkt