Merge "Changes for VPP 19.08 release"