CLOUDSTACK-7544: Fixed ip addr del issues in ipassoc
CLOUDSTACK-7540: Fixed NPE in check s2svpn connection status
CLOUDSTACK-7134: Fixed test cases for basic zone, services dict was getting overwritten which passed zone type as advanced even in basic zone setup

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS CLI guestOS on VMware.
Fixed the jp keyboard issues for VMs deployed with keyboard=jp param.
CLOUDSTACK-7391: Passing virtualmachineid while retrieving suitable hosts for migration

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
CLOUDSTACK-7135: test_baremetal.py - Tagging test case as invalid

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>