Merge pull request #3664 from twz123/no-envoy-image-in-config

Merge pull request #3664 from twz123/no-envoy-image-in-config #93