Split ServletFacet into ServletFacet_3_0 and ServletFacet_2_5