Minor refactoring of ATs
Merge branch 'master' into DS-1008

Conflicts:
	sli/acceptance-tests/test/features/apiV1/validation/step_definitions/validation_steps.rb