remove unused code
Adding unit tests
Merge from upstream
Phase out usage of Agent::GetInstance()
merge commit
Fix compilation error
Merge pull request #315 from praveenkv/master

Fix compilation error
Merge pull request #311 from manishsing/master

add UT cases