Merge "Remove empty metadata_settings from iscsid and multipathd templates"