CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier

Signed-off-by: Jayapal <jayapal@apache.org>
Fixed issue in setting vm ip,mac in vm_instance table

This issue is not seen in 4.2, It is observed only in 4.3.
CLOUDSTACK-2560: Adding duplicate ASA device entity failure should be handled with API

Handling duplicate ASA appliance addition gracefully