Summary: devcloud-kvm marvin zone config fix for 4.2, add provider to img store

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1374264479 -0600
InternalLb: fixed creation for default network offering with internal lb support - public lb support should be disbaled on it
CLOUDSTACK-732 Add disk snapshot for KVM 6.3, add the flag in CS.

Signed-off-by: Edison Su <sudison@gmail.com>

Conflicts:

	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
CLOUDSTACK-3651: Infrastructure menu - zone detail - listVmwareDcs API only exists in non-oss build, suppress error "The given command does not exist or it is not avaiable for user" from UI for this specific case.
CLOUDSTACK-3453
UCS:API: List Blades after decommissioning a blade, listUcsBlades API returns wrong number of total blades

fixed resolved
System Template shows twice in listTemplates with S3 as secondary
storage.
CLOUDSTACK-3428
UCS:API: We need listUCSManager API to lists all UCS managers registered with CloudStack

fix entityType in api command
CLOUDSTACK-3643: Fix wrong protocol type and test case sequence
CLOUDSTACK-3620: [Automation] API removevpnuser failed, in test case test_project_usage.TestVpnUsage.test_01_vpn_usage.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK:3452: Check if security groups feature is enabled in basic zone before creating security group while creating VM

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3c360ce02807240586d471ab4c0cbd24d76ed7e6)
CLOUDSTACK-3452: Refactor VirtualMachine.create()

When creating a VM if it's going to a basic zone program sec.group rules
so as to allow SSH access for any tests requiring ssh access to the
guest. Similarly method used to program the NAT and PF for SSH access is
refactored and extracted into a separate method. By default no SSH
access is allowed if the mode is set to 'default'

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 9c9003a0dba755135f643777083b80ec5fa3d910)
CLOUDSTACK-3075: append test case name to account

Accounts will be prepended by the testcase name to ease analysis
post-test runs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 17af34fd19ba9aa310a416e8e8cb80de37a018c2)
CLOUDSTACK-3365: cluster level parameters cluster.(cpu/memory).allocated.capacity.notificationthreshold is not considering overcommit value
CLOUDSTACK-3419: [Object_Store_Refactor] Uploaded volume is being
deleted while attaching it to guest VM.
CLOUDSTACK-3684:Failed to start MS due to missing UCS configuration
values in DB.
CLOUDSTACK-3513: ListIsos/ListTemplates does not return correct results
when id and zoneid are passed.
Changes related to Review Board comments
CLOUDSTACK-3274: API Refactoring: secretkey and accesskey of the backing
store is found in plaintext in the logs.

Conflicts:
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java
Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm"

This reverts commit f99d599930a4bc1bfcdfd44d4f088cdae58890e5.

Due to it break vpc function and block regression test.

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java
CLOUDSTACK-3643: Automation: Fix wrong network acl rule for ping