add missing python-jsonpatch dependency
Mention which bug asked us to require jsonpatch

https://bugzilla.redhat.com/show_bug.cgi?id=1103281
Make dmidecode dependency arch-dependent

https://bugzilla.redhat.com/show_bug.cgi?id=1025071
Write /etc/locale.conf instead of /etc/sysconfig/i18n

https://bugzilla.redhat.com/show_bug.cgi?id=1008250#c13
Add tmpfiles.d configuration for /run/cloud-init

https://bugzilla.redhat.com/show_bug.cgi?id=1103761
Use the %license rpm macro
BuildRequire python-setuptools, not python-setuptools-devel
Merge branch 'f20'

Conflicts:
	cloud-init.spec