Merge proposals dependent on lp:~markmc/nova/iscsi-tgtadm-choice

lp:~markmc/nova/iscsi-tgtadm-choice has no merge proposals.