Removing relationship between vlan and (CloudStack) network from database when trashing a network
Merge branch 'networkapi_4.2.0' of github.com:globocom/cloudstack into networkapi_4.2.0