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