cherry pick error fixed
CLOUDSTACK-4565 review comments on network section has been fixed
build error fixed