fix '[: ==: unary operator expected' errors
Merge pull request #2042 from maxamillion/dev/maxamillion/oo-accept-cleanup

Merged by openshift-bot