only need iconv-devel if rhel/centos < 5.4
Merge branch 'feature/iconv-devel' into develop

Conflicts:
	attributes/default.rb