shixiong/okd @ 42fd5866e3eeb878f7d890005bf69365fade5482

OpenShift Merge Robot 1c9c93d616 Merge pull request #7103 from vrutkovs/origin-dns-prepend-cluster-local		%!s(int64=7) %!d(string=hai) anos
..
networkmanager	29bd49e458 origin-dns: make sure cluster.local DNS server is listed first	%!s(int64=7) %!d(string=hai) anos
bootstrap.yml	f8ca310090 Remove node start from bootstrap.yml.	%!s(int64=7) %!d(string=hai) anos