Behat: Backport improved dropdown step handler