Merge "Fix broken retaildemo tests" into oc-dev