Fixing manage users cukes

Done modifications to manage_users.feature.

merged some of the common steps in user_steps.rb