Fix up use of 1.7 Java diamond operator, and try to fix broken Cucumber feature test