CLOUDSTACK-5276: Remove wrong select column from LB/PF list select
CLOUDSTACK-5521: Create multi-core topology when deploying KVM virtual machines with many cores
CLOUDSTACK-669: refactor VM work job dispatcher to allow volume/snapshot manager to participate serialized job handling
Fix tab and trailing spaces
Reduce width of multiselect column to prevent overflow
Truncate event type column to prevent wrapping
Fix wrapping for port forwarding multiedit fields in FF
CLOUDSTACK-5252: UI > Infrastructure > Virtual Routers > group by zone/pod/cluster > include project-related routers into calculation.
CLOUDSTACK-5519. [VMWARE] Cancel vCenter tasks if the task invoked by CloudStack failes with timeout error

Conflicts:

	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
CLOUDSTACK-5489: Query the user name and add it to the command while mounting a cifs share.
Fixing compile error found by checkstyle
CLOUDSTACK-5217: Attach volume fails with NPE. Made changes to make sure
the hypervisor product version is reported on startup. Also made changes
to fix attach and detach volume on scsi controller.
CLOUDSTACK-4875. Vmware vCenter 5.5 - System VM deployment fails During VM deployment.
When base template is being cloned to create VM ROOT disk, get the disk path i.e. base file name
of the VM's ROOT disk from vCenter
CLOUDSTACK-5532: Tag UI: Truncate long tag key/value
CLOUDSTACK-5531

Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM.
CLOUDSTACK-5486: UI > tags > listXXXXXXX API now returns tags property. So, use tags property in embedded object returned by listXXXXXXX API to populate tags in detailView in all pages (instead of calling extra API listTags).
CLOUDSTACK-4852: Since upgrade to 4.2 only users at the zone-attached domain level can manipulate VMs

Changes:
- The vmprofile owner passed in to the planner should be the VM's account and not the caller
- Do not do the access check for Root Admin

Conflicts:

	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
CLOUDSTACK-4852: Since upgrade to 4.2 only users at the zone-attached domain level can manipulate VMs

Changes:
- Removing the trailing spaces in the file
reverted 3a3fec3cb6bb4f9a008370ea02279d286654b01a because it fails a unit test
CLOUDSTACK-5476: Fix missing settings tab on zone details