Removed the default legacy CDI, (as far as I know) there is no recommended CDI for "legacy" in r22.
cc @dguest, @fdibello and @ligang.