initial import of 2.6
updated to support skipping surefire tests