[KFSQA-838] Fixed some merge-related errors.
Fixed some stuff that wasn't working on the nightly run.
Merge branch 'master' into KFSQA-916

Conflicts:
	features/step_definitions/chart_of_accounts/account.rb