Conflicts: docs/kibana/configuration/config.js.asciidoc src/app/components/settings.js src/app/panels/dashcontrol/module.html src/app/partials/dasheditor.html src/config.js
