more fixes
Merge branch 'networkapi_4.2.0' of github.com:globocom/cloudstack into networkapi_4.2.0