fix for 2462 from bitbucket
Merge pull request #472 from Juniper/2462

fix for 2462 from bitbucket
During Flow delete, the SetFlowEntry was getting invoked twice from ksync_sock_user.cc which is not required.
Fixes failure of test_sandesh_kstate.cc in flow delete path
Merge pull request #475 from Juniper/ashoksr_ut

During Flow delete, the SetFlowEntry was getting invoked twice from ksyn...
Merge remote branch 'github/master' into rtarget