Don't make nova-compute depend on iSCSI

Because not all volume drivers require iSCSI it makes sense to not
set the initiator in the connector and let the volume drivers
return an error if iSCSI is required.

bug #1007084

Change-Id: I5da472e5013fdc0c733ecb12b919c1068873bdc6
Fix bad vm_state change in reboot_instance()

Currently reboot_instance() in the compute manager
changes the vm_state to active before it does anything
else. This means that if there is an error in the reboot
operation then the vm_state is left as active although
the instance may not be running.

This change leaves the vm_state alone until the reboot
has completed

If the reboot fails but the power_state shows that it
is running then we log the fault but leave it in an
active or rescued state

If the reboot fails and the power_state shows that it
is not running then we set vm_state to error

See also https://bugs.launchpad.net/nova/+bug/1183946
which make recovery from an Error state possible.

Fixes bug: 1188343

Change-Id: Idabd358d3bcaf63e21ff59188f805143dbaf9ada
Merge "Don't make nova-compute depend on iSCSI"
Merge "Fix bad vm_state change in reboot_instance()"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp