few smaller changes to config bundles
Merge branch 'master' of github.com:Graylog2/graylog2-web-interface

Conflicts:
	app/views/system/bundles/export.scala.html
	javascript/src/components/source-tagging/ConfigurationBundles.jsx