Merge "Fixes vagrant base box to be opnfv"