Fix failing cucumber spec

in the "edit a user without selecting a user" case.

Also, fix some deprecation warnings for using `all` instead of `to_a`
Merge branch 'master' into production