Merge "Fix processing of broken symbolic references in RefDirectory"