CLOUDSTACK-5639: If path field in the TO already has the complete path, do
not try to generate the path.
CLOUDSTACK-5657: Run the service as an account (hyper-v admin on host) so
that migration can work across hosts.
CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template in ready state with
matching given ostype
CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters.

Conflicts:
	engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
CLOUDSTACK-5647 Adding F5 device to network service provider fails with
NoClassDefFoundError

adding back missing (removed from 4.3) dependency 'commons-discovery'
CLOUDSTACK-5651 deployVm: customparameters param name has to be changed

Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
CLOUDSTACK-4904: Unable to see a derieved template if the
 parent template is deleted. Modified template_view so that removed(or InActive) templates also be there in the view.
Previous behavior of listing templates and state column in vm_templates will be the same.
CLOUDSTACK-5840: UI > Secondary Storages > remove "prepareObjectStoreMigration" action (since prepareSecondaryStorageForMigration API has been removed from server-side).
CLOUDSTACK-5840: UI > Snapshots > create volume from snapshot dialog > add zone dropdown if region-wide secondary storage exists.
CLOUDSTACK-5557: UI > Network > Guest Network > IP Address > fix a bug that SourceNAT IP, VPC tier IP wrongly showed Configuration tab(firewall/portforwarding/loadbalancing).

SourceNAT IP, VPC tier IP should not show Configuration tab(firewall/portforwarding/loadbalancing).
CLOUDSTACK-5656: UI > network > IP Address > configuration tab > Port Forwarding > add "State" column.
CLOUDSTACK-5853
Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.

Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.

First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.

Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).

Need to remove matching pool from the avoid set during each select phase.
CLOUDSTACK-5614: UI > Hosts > detailView > add new field "The Number of CPU Sockets".
Removed a duplicate method
Fix for defect CLOUDSTACK-5053, QEMU should be installed in KVM agent hosts
CLOUDSTACK-5614: UI > Infrastructure > Sockets > show "N/A" in Socketes column for hypervisors that don't support socket info.
CLOUDSTACK-5829:
listvms should return the diskoffering id when deployed with an iso
CLOUDSTACK-5732 [UI] Search is not working in Affinity Groups panel

- Added keyword support

Conflicts:

	api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
	api/src/org/apache/cloudstack/query/QueryService.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
CLOUDSTACK-5492: UI > Routers > Group by zone/pod/cluster/account > (1) fix a bug that requiresUpgrade wrongly showed"No" when it should show "Yes".
(2) detailView > add new field "Total of Virtual Routers that require upgrade".
CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
equate empty string to untagged in api parameter input