Set tenant_network_type and network_vlan_ranges in neutron conf file

(cherry picked from commit 17a41c1da3ffba2f8efcda00fb21b17abce87b34)
Use num_vlans attribute from neutron proposal instead of hard-coded 2000

(cherry picked from commit 3ac58984aa2fbc83f3455f5b82e3def496ab6932)