Update envoy installation.
Merge branch '4.1'