Merge proposals dependent on lp://qastaging/~adam-stokes/ubuntu/precise/open-iscsi/fix-lp-1053306

lp://qastaging/~adam-stokes/ubuntu/precise/open-iscsi/fix-lp-1053306 has no merge proposals.