UPSTREAM: 61378: --force only takes effect when --grace-period=0#19213
Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom May 29, 2018
--force only takes effect when --grace-period=0#19213