[openstack-neutron/f20] Better support for upgrading from grizzly to havana

[Terry Wilson]

Summary of changes:

  351c853... Better support for upgrading from grizzly to havana (*)

(*) This commit already existed in another branch; no separate mail sent