Automated cherry pick of #11233 #11254 on release 3.4#11255

Merged

gyuho merged 2 commits intoetcd-io:release-3.4from jingyih:automated-cherry-pick-of-#11233-#11254-upstream-release-3.4

Oct 15, 2019

+6-2

Commits on Oct 15, 2019