Bringing in changes from https://github.com/cucumber/cucumber-jvm/commit/e6beaf4 to help fix issue compiling cucumber-jvm/java on OSX with JDK7