Remove primarydatastoreTo in vmwareresource
CLOUDSTACK-730: UI > VPC > Router > site-to-site VPN > VPN Connection > detailView > add "Passive" field.
CLOUDSTACK-4908: UI > Infrastructure > Sockets > view all > calculate Hosts for each hypervisor.
CLOUDSTACK-4948: DeploymentPlanner: Logic to check if cluster can be avoided, needs to consider if VM is using local storage and/or shared storage

Changes:
- Consider if VM requires the local storage or shared storage or both for its disks.
- Accordingly all pools in the cluster should consider local or shared or both pools

Conflicts:

	server/src/com/cloud/agent/manager/allocator/HostAllocator.java
CLOUDSTACK-4948: DeploymentPlanner: Logic to check if cluster can be avoided, needs to consider if VM is using local storage and/or shared storage

Changes:
	- Changes due to VirtualMachineProfile changes done in master
CLOUDSTACK-4755: cloudstack 4.x does not allow memory upgrade

Changes:
- Set total capacity of a host if it has changed in the CapacityChecker thread
- Fix bug while setting the reserved/used cpu/mem capacity - only one of them used to get set
CLOUDSTACK-5028. Vmware instance fails to start when the chain_info of any volume that belongs to the VM is longer than 255 characters.
If the VM has snapshots then the chain_info of a volume can be longer than 255 characters.
Increasing the column length of chain_info in VolumeVO to match the maximum length of type text(db schema type)
CLOUDSTACK-5032 Provides custom assert facility to test features

Added assertElementInList to cloudstackTestCase.
Users can use this new custom addition to add
assertions, thus replacing current multiple assertions

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes.
CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse

Signed-off-by: Koushik Das <koushik@apache.org>
CLOUDSTACK-3715. Fix import error.
Allow disabling modules and extensions from module.properties

Discovery of modules is based on classpath scanning.  In some situations it
may not be possible or desirable to change the classpath.  To force a
module to not load you can create a file called modules.properties on the
classpath that can exclude specific modules from loading.  Additionally
this same file can be used to exclude a specific extension.  Extension
loading is typically done through global configuration.  If you want to set
up an environment and you don't even want the extension/module loaded on
the first start, then using the config file is appropriate.

Example: modules.properties

modules.exclude=storage-image-s3,storage-volume-solidfire
extensions.exclude=ClusterScopeStoragePoolAllocator,ZoneWideStoragePoolAllocator

Typically you would want to place this file in /etc/cloudstack/management
CLOUDSTACK-4736: Monitoring services in VR
Fixed some html validation errors

language tag in script is deprecated. used type
<script> tag after </html> is invalid. moved the localized messages dictionary inside html body.
CLOUDSTACK-4908: UI > Infrastructure > Sockets > (1) calculate total number of CPU Sockets for all hypervisors.
(2) > view all > calculate CPU Sockets for each hypervisor.
CLOUDSTACK-4793: UI > Infrastructure > Virtual Routers > detail tab > add Version field which will include text "Requires Upgrade" if VR version is different from MS version.
multiEdit: extend field hide/show functionality

-Support passing isHidden option as closure, for conditional hide/show
 based on context

-Adds new option format for isHidden option:

return false == show field and all columns (default)
return true == hide only header and form column
return 2 == hide header and form, as well as returned item column -- these
item columns will be skipped over entirely, not just hidden
Network chart: Fix layout CSS
git config files were missing the ASF license
CLOUDSTACK-5038:
used cpu is getting bumped up when the over provisioning factor > 1. This was because we didnt record the overprovisioning factors of the vms which got deployed pre 4.2
Upgrade path will fix that by populating the cpu/mem overprovisioning factors for each of the vms in user_vm_details table using the global overprovisioning factor.
Reviewed by : bharat kumar <bharat.kumar@citrix.com>
Signed off by : nitin mehta<nitin.mehta@citrix.com>