Merge latest changes from Juniper/contrail-test master branch