Merge "Add IOmxStore and remove IOmxNode::setQuirks." into oc-dev