Merge to tag public-0.5 (src)
Merge branch 'master' of github.com:Juniper/contrail-controller