Janitorial - merge upstream changes for iscsid.conf
Janitorial - merge upstream changes for iscsid.conf

This has no functional impact since only comments were merged in.

jflorian/puppet-iscsi,jflorian/puppet-iscsi