Merge "Handle configuration splits when creating the class loader context" into oc-mr1-dev