Renames instance_type to flavor in baremetal virt driver

  According an already merged blueprint flavor-instance-type-dedup
  + Reorder ovs_vsctl_timeout in
    tools/autogenerate-config-flagmappings/nova.flagmappings

Change-Id: Ife6fd326b1581a57b0810f12a8c0c6aa8160e8ea
Closes-Bug: #1260092
Merge "Renames instance_type to flavor in baremetal virt driver"