Merge "Bump etcd to 3.3.12" into release/2019.2.0