Conflicts:
	playbooks/edx-west/carnegie-prod-app.yml
	playbooks/edx-west/prod-jumpbox.yml
	playbooks/edx-west/stage-all.yml
	playbooks/roles/common/tasks/create_users.yml (deleted)
	playbooks/roles/datadog/handlers/main.yml
	playbooks/roles/edxapp/defaults/main.yml
	playbooks/roles/edxapp/tasks/deploy.yml
	playbooks/roles/edxapp/tasks/main.yml
	playbooks/roles/nginx/tasks/main.yml
	playbooks/roles/nginx/templates/basic-auth.j2
	playbooks/roles/nginx/templates/edx_logrotate_nginx_access.j2
	playbooks/roles/nginx/templates/edx_logrotate_nginx_error.j2
	playbooks/roles/xqueue/tasks/main.yml