Target JDK 1.6
Merge branch 'master' into RESTEasy3