Fixed the multi-role step def. Added some missing elements to the users.yml.