Another unrelated question, will the

caravel_bump_bond

layout be reused for MPW2? ie. if I arrange my floorplan to avoid the RDL routing based on the layout in the repo that will hold for MPW2?

Yes. Since nobody has coughed up $20k for a new mask set, the MPW-one RDL mask set will be the only RDL mask set going forward.