Waratahs confirm round swap with Rebels