shixiong/okd @ 6f7e63501c29cfb4168e0a1a9adb3ee27b97cdaa

OpenShift Merge Robot 5694ad07a1 Merge pull request #11661 from vrutkovs/crictl-ignore-errors		5 gadi atpakaļ
..
aws	8ade8da8b9 Use "crio" as a service name	5 gadi atpakaļ
tox-inventory.txt	0d15601985 Update tox test environment vars	5 gadi atpakaļ