Merging Juniper/contrail-web-core to absingla/contrail-web-core