BVAL-452 Remove @Deprecated according to Java EE compatibility requirement rules
XMLEditor wrapping realignment