2012.1 "Essex"

Final versioning for 2011.3.1

Change-Id: I444a726c3906f3c25a47b558df4225bda36efe8c

Ensure fkey is dropped before removing instance_id

This fixes Bug #904888

On MySQL databases that use InnoDB by default (ie, at the point when
database is being first migrated), extra care needs to be taken to
ensure FKs are dropped before columns because they are not automatically.

Patch from Adam Gandelman and Scott Moser.

Change-Id: I32919a46bb76f524e064098738ad98248b2f1c0e

Merge "Define faults.Fault.__str__."

Final versioning for Diablo

Backported fix for run_iscsiadm.