Update L10N strings from Transifex to repo
CLOUDSTACK-3347: fixed project deletion for project's owned template

Conflicts:
	server/src/com/cloud/template/TemplateAdapterBase.java
fix marvin when deploy vmware setup
fix can't find host ip address on Mac OS
CLOUDSTACK-3207: UI > domain page > get total number of instances, volumes by both listAccounts API and listProjects API.
CLOUDSTACK-1676: UI > zone wizard > basic zone > pass securitygroupenabled=true if selected network offering includes security group service; pass securitygroupenabled=false if selected network offering does not include security group service.
Moved HostAllocator and PodAllocator from server to api package, where they are supposed to be.  In the process, I had to change the VO objects used by these two itnerfaces to interface equivalent.  This makes sense because there's really no reasons why allocators require write access to the database.  One of the files have been reformatted because it contained a bunch of tabs instead of spaces for indentation.
CLOUDSTACK-3295. Code should look for xes.keystore under cloud-awsapi-4.2.0-SNAPSHOT and not under generated-webapp.
CLOUDSTACK-1444. Add 3 awsapi profiles 1. Download ec2 wsdl for 2012-08-15 2. Generate stubs (server and client) from the wsdl 3. Remove the ec2 wsdl [Support for EC2 API version 2012-08-15]

Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15]

Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
CLOUDSTACK-1444. Modified services.xml. [Support for EC2 API version 2012-08-15]

Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
CLOUDSTACK-1444. Updated EC2SoapService and EC2SoapServiceImpl to be compatible with the java stubs generated from EC2 WSDL 2012-08-15.
  - by adding stubs for the new EC2 APIs (unsupported by CS AWSAPI)
  - by setting the new EC2 API response elements
  - by adding support for the new EC2 API request elements
[Support for EC2 API version 2012-08-15]
CLOUDSTACK-3258. In AWSAPI provide Tags support for resource 'security group'

Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
CLOUDSTACK-1444. Fixing cloudstack-aws-api-register to set ec2 api version to the latest. [Support for EC2 API version 2012-08-15]

Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
CLOUDSTACK-1444. Fix EC2 Query API to support latest ec2 api version 2012-08-15 [Support for EC2 API version 2012-08-15]

Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files
[Support for EC2 API version 2012-08-15]
CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files
[Support for EC2 API version 2012-08-15]
CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files
[Support for EC2 API version 2012-08-15]
Separate the loadbalancing tests

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-3354: Fix scalevm test

After you scale the vm, user is expected (oddly) to update the virtual
machine to signal that the PV tools are installed. This tells cloudstack
that the VM has been successfully scaled up/down.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c8ad4e5ced323d27862b7197a05f022f1a6efd4f)