Merge with tag public-0.6 (src/sandesh)
Fix syntax
Merge branch 'master' of github.com:Juniper/contrail-sandesh