CLOUDSTACK-4728: Fixing the system template names