Fixing compilation issues on OSX+JDK7 as per discussions on https://github.com/cucumber/cucumber-jvm/issues/487