Merge "Always start iscsid for nova-compute"