Revert "Revert "Upgrade to latest Calcite release (renamed from Optiq).""

This reverts commit 15a9243f661e47726d5535e7124d6a9b0ae1b617.