Merge "Update vagrant/ to install vpp packages and use vppctl"