For 1.0.1, should we pull Proxy from:

1. master branch, which already includes the fix, but also a few unrelated changes,
2. release-1.0 branch, after we roll-forward Envoy to include the fix,
3. release-1.0 branch, with cherry-picked ORIGINAL_DST_LB fix.

?

cc @costinm