Merge "Use local variable for live migration server client"