Update TRD v21a by Alexandru and complete mCBM 2021_07 setup, update external/geometry tag, refs #2215