Moved language help to new features (another attempt)

Waiting for aruba release with https://github.com/cucumber/aruba/pull/151 applied, so that we don't see intermittent test failures on different environments.

This reapplies the original commit 5d315b6 which was then reverted in 75993d9.

Helps with #408.