Remove mysql server_id cherry-pick

This already merged upstream and our LKG commit includes it, which
causes the cherry-pick to fail.