~ dropped several unused tests
Merge branch 'bugfix/TOMEE-1416' into develop-kasi