Merge "fix vagrant script to deploy onap"