Merge "Fix 'Read-only filesystem' errors in ojluni merged tests."