Merge "Revert the test_kvmfornfv.sh"