explicitly tell Maven which classes do contain unit tests
Merge branch 'refs/heads/trunk'