Fix failure of test case in test_kstate
Merge branch 'master' into ashoksr_ut
Update comment in code
Merge pull request #332 from Juniper/ashoksr_ut

Fix UT failure in test_kstate