Merge "Add neutron_enable_qos option"