Note to backporters, the dependent fix in https://bugs.launchpad.net/nova/+bug/1065004 should be backported along with this fix.
Note to backporters, the dependent fix in https:/ /bugs.launchpad .net/nova/ +bug/1065004 should be backported along with this fix.