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