master

RESTEASY-699, RESTEASY-913, RESTEASY-916