packing fixes
Merge branch 'networkapi_4.2.1' of github.com:globocom/cloudstack into networkapi_4.2.1