Merge tag '2014.2_b1' into debian/juno

Merge tag '2014.2_b1' into debian/juno

Heat juno-1 milestone (2014.2.b1)

Conflicts:
	heat/locale/ar/LC_MESSAGES/heat.po
	heat/locale/bg_BG/LC_MESSAGES/heat.po
	heat/locale/bn_IN/LC_MESSAGES/heat.po
	heat/locale/bs/LC_MESSAGES/heat.po
	heat/locale/ca/LC_MESSAGES/heat.po
	heat/locale/cs/LC_MESSAGES/heat.po
	heat/locale/da/LC_MESSAGES/heat.po
	heat/locale/de/LC_MESSAGES/heat.po
	heat/locale/en_AU/LC_MESSAGES/heat.po
	heat/locale/en_GB/LC_MESSAGES/heat.po
	heat/locale/es/LC_MESSAGES/heat.po
	heat/locale/es_MX/LC_MESSAGES/heat.po
	heat/locale/eu/LC_MESSAGES/heat.po
	heat/locale/eu_ES/LC_MESSAGES/heat.po
	heat/locale/fa/LC_MESSAGES/heat.po
	heat/locale/fi_FI/LC_MESSAGES/heat.po
	heat/locale/fil/LC_MESSAGES/heat.po
	heat/locale/fr/LC_MESSAGES/heat.po
	heat/locale/gl/LC_MESSAGES/heat.po
	heat/locale/he/LC_MESSAGES/heat.po
	heat/locale/he_IL/LC_MESSAGES/heat.po
	heat/locale/hi/LC_MESSAGES/heat.po
	heat/locale/hr/LC_MESSAGES/heat.po
	heat/locale/hu/LC_MESSAGES/heat.po
	heat/locale/id/LC_MESSAGES/heat.po
	heat/locale/is_IS/LC_MESSAGES/heat.po
	heat/locale/it/LC_MESSAGES/heat.po
	heat/locale/it_IT/LC_MESSAGES/heat.po
	heat/locale/ja/LC_MESSAGES/heat.po
	heat/locale/ka_GE/LC_MESSAGES/heat.po
	heat/locale/km/LC_MESSAGES/heat.po
	heat/locale/kn/LC_MESSAGES/heat.po
	heat/locale/ko/LC_MESSAGES/heat.po
	heat/locale/ko_KR/LC_MESSAGES/heat.po
	heat/locale/ml_IN/LC_MESSAGES/heat.po
	heat/locale/mr_IN/LC_MESSAGES/heat.po
	heat/locale/ms/LC_MESSAGES/heat.po
	heat/locale/nb/LC_MESSAGES/heat.po
	heat/locale/ne/LC_MESSAGES/heat.po
	heat/locale/nl_NL/LC_MESSAGES/heat.po
	heat/locale/pa_IN/LC_MESSAGES/heat.po
	heat/locale/pl_PL/LC_MESSAGES/heat.po
	heat/locale/pt/LC_MESSAGES/heat.po
	heat/locale/pt_BR/LC_MESSAGES/heat.po
	heat/locale/ro/LC_MESSAGES/heat.po
	heat/locale/ru/LC_MESSAGES/heat.po
	heat/locale/ru_RU/LC_MESSAGES/heat.po
	heat/locale/sk/LC_MESSAGES/heat.po
	heat/locale/sl_SI/LC_MESSAGES/heat.po
	heat/locale/sv/LC_MESSAGES/heat.po
	heat/locale/sw_KE/LC_MESSAGES/heat.po
	heat/locale/tl/LC_MESSAGES/heat.po
	heat/locale/tl_PH/LC_MESSAGES/heat.po
	heat/locale/tr/LC_MESSAGES/heat.po
	heat/locale/tr_TR/LC_MESSAGES/heat.po
	heat/locale/uk/LC_MESSAGES/heat.po
	heat/locale/ur/LC_MESSAGES/heat.po
	heat/locale/vi_VN/LC_MESSAGES/heat.po
	heat/locale/zh_CN/LC_MESSAGES/heat.po
	heat/locale/zh_HK/LC_MESSAGES/heat.po
	heat/locale/zh_TW/LC_MESSAGES/heat.po

Rewritten-From: 5f4b0eb21a305e125562f26741c33ac807f64d83