Merge "consumerir.default: remove unneeded dependency." into oc-dev