Pull changes from Juniper/web-core to absingla/web-core