Add utility classes for easier testing.
Merge branch 'master' into RESTEasy3