Update submodules for retagged 2.3.0-rc.6 (again)