Merge "KVMFORNFV: Reverting LiveMigration changes"