BZ-1039618 Same methods for extra JAXB classes
(cherry picked from commit c3353ca23d182919141da6f51ca0fdb9e5ea2120)