Conflicts: CHANGELOG.md playbooks/roles/edxapp/tasks/deploy.yml playbooks/roles/insights/defaults/main.yml playbooks/roles/xqwatcher/tasks/deploy_watcher.yml
