Simplified default surefire configuration
Merge branch 'master' into Hibernate4