Update structured-merge-diff version#155

Merged

k8s-ci-robot merged 2 commits intokubernetes:masterfrom

jennybuckley:update-smd-2

Apr 25, 2019

Commits on Apr 18, 2019

Update schemaconv to accept smd changes
jennybuckley
committed
Run `GO111MODULE=on go get -u sigs.k8s.io/structured-merge-diff`
jennybuckley
committed