Rename test classes so that their tests are run by Maven
Merge branch '1.1.x'