CLOUDSTACK-6568:API:createVolume: Volume gets created with wrong domain
ID.
Update L10N resource files on master branch (with 4.4 translation strings)
Remove bad backslash near "label.nicira.nvp.details" key.
Added unit tests for Juniper contrail VM Interface Model and Instance Ip Model class

Signed-off-by: Daan Hoogland <daan@onecht.net>
CLOUDSTACK-6571 bugfix: 'service cloudstack-agent stop' fails to stop the process started on boot
CLOUDSTACK-6559: Added listall=True to list vm API
Cloudstack-5077: reserve cpu and memory only when vmware.reserve.cpu/mem are set to true. Insted of setting the ovecommit values to one on upgrade, we popultate them from the global values.

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
	engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
CLOUDSTACK-6463: password is not set for VMs created from password enabled template
CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2
CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest network configured on the eth device
CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in VR/VpcVR to configure VPC entities
Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork prepare command got changed
CLOUDSTACK-6479: Strict and Preferred modes should only be allowed in Implict Dedication Planner Service Offerings.
CLOUDSTACK-5907, CLOUDSTACK-6396: KVM/RBD & KVM/CLVM volumes mistakenly shown as OVM, disables snapshotting

modified:   server/src/com/cloud/api/ApiDBUtils.java

Signed-off-by: Daan Hoogland <daan@onecht.net>
CLOUDSTACK-2697 Removed the clusterId as null from the alert message logs

Signed-off-by: Daan Hoogland <daan@onecht.net>
CLOUDSTACK-5976: Typo in "ssh_keypairs" table's foreign key constraints
on the Upgraded Setup
CLOUDSTACK-3932: UI: Fix Truncation issue in secondary storage URL

Signed-off-by: Brian Federle <brian.federle@citrix.com>
CLOUDSTACK-6342: Fix LB table listing for Firefox
CLOUDSTACK-6483: UI > Load Balancing > "VM+IP" listing > After removing a "VM+IP" under a LB rule, AddVMs dialog should reflect the change (i.e. show the removed IP in IP dropdown in AddVMs dialog)
CLOUDSTACK-6552 Cloudstack-Management install package creates log
directory that is never used