Fix duplicate timeout directive#17030

Merged

openshift-merge-robot merged 2 commits intoopenshift:masterfrom

imcsk8:duplicate-timeout

Oct 31, 2017

Commits on Oct 24, 2017

Fix duplicate timeout directive
imcsk8
committed

Commits on Oct 30, 2017

Fix incorrect comment in template
imcsk8
committed