Japanese globalization properties file
Simplified Chinese file for CS globalization
Fix regression of return Userdata provider when caller asked for DHCP

It's introduced by:

commit 052c24c4d1c881f791b804dbb9c2fc083af7da36
Author: Bharat Kumar <bharat.kumar@citrix.com>
Date:   Mon May 13 17:02:27 2013 +0530

    CLOUDSTACK-702: Multiple ip ranges in different subnets.

This commit get userdata provider when caller asked for dhcp provider, thus
result in trouble e.g.

ERROR [cloud.async.AsyncJobManagerImpl] (Job-Executor-11:job-10) Unexpected
exception while executing
org.apache.cloudstack.api.command.user.network.DeleteNetworkCmd
java.lang.ClassCastException:
com.cloud.baremetal.networkservice.BaremetalUserdataElement_EnhancerByCloudStack_5dee69d2
cannot be cast to com.cloud.network.element.DhcpServiceProvider
        at
com.cloud.network.NetworkManagerImpl.getDhcpServiceProvider(NetworkManagerImpl.java:3309)
...
CLOUDSTACK-3069: [UI]Quickview of POD is not displaying any info in UI
Cloudstack-2938 [Multiple_IP_Ranges] Password Service does not work in case of multiple subnets in a vlan

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a new subnet

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
Cloudstack-2621 [Multiple_IP_Ranges] Failed to delete guest IP range from a subnet
CLOUDSTACK-2167: The Vlan ranges displayed are not in ascending order
CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm

CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
merge to master
Cloudstack-2644 [Multiple_IP_Ranges] user data service on VR does not work in case of multiple subnets Cloudstack-2953 [Multiple_IP_Ranges] VM does not get the public key from VR incase of multiple subnets per vlan Also removed some unused code and fixed the an error in the dnsmasq config function

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
Add fix for CLOUDSTACK-2168. Changed listAll output to conform to the same output as listconfiguration

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
CLOUDSTACK-2168: removed unused commit
CLOUDSTACK-3078. Since no default value is set for the isolation type during the physical network creation,
 modify guest vlan range dedication to check if the isolation type is VLAN only when an isolation type has been set
merge object_store
fix compile
CLOUDSTACK-3078
CLOUDSTACK-2017: network throttling implementation for KVM
CLOUDSTACK-2915: Create network ACL when adding ACL item to a tier without ACL for backward compatibility
CLOUDSTACK-2952 Fixed configuring private gateway with another vpc acl id