Simplify format of test-kitchen config
Merge branch 'refs/heads/develop' into feature/user-lwrp

Conflicts:
	.kitchen.yml
Changelog entry