Cucumber suite improvements

Cucumber suite improvements. Also includes a contribution from #1033.
Some stats:

    # master
    20 scenarios (3 pending, 17 passed)
    103 steps (2 skipped, 3 pending, 98 passed)

    # this branch:
    20 scenarios (1 pending, 19 passed)
    104 steps (1 pending, 103 passed)

I tried to write detailed commit messages [example](https://github.com/bruno-/capistrano/commit/f5421e512e7a05f1031eb3e3a55adee05f3ccfa1) to "preserve the knowledge" about how these scenarios work.

The contributing guidelines say we should squash the commits, but I have refrained from doing so because we would loose some of the info from the commit messages.
Other than that, I think I'm in compliance with the guidelines.