added parameters for  'enable_tunneling', tunnel_types' and 'tenant_network_type'
Merge branch 'parameterized_ovs'