Merge proposals dependent on lp://staging/~zulcss/nova/nova-api-fix

lp://staging/~zulcss/nova/nova-api-fix has no merge proposals.