Merge "Be prepared to handle empty class loader contexts" into oc-mr1-dev