Changing from no-cert to edge encryption should not panic#15550

Merged

openshift-merge-robot merged 2 commits intoopenshift:release-3.6from smarterclayton:strategy

Jul 31, 2017

+79-10

Commits on Jul 30, 2017