CLOUDSTACK-2570: Fix duplicate resource name field