Branch 2 3

RESTEASY-699.