Adding annotations to router commands
Add marvin integration test for list VM.
CLOUDSTACK-6158: Fix few changes
CLOUDSTACK-6160: Changes to marvin apiclient

Removed apiclient.hypervisor references. More details in the bug
Few other changes pending for this related to VirtualMachine.create
need to be cleaned up
BUG-ID: CLOUDSTACK-6162: UI > zone > physical network > service provider > add OVS.
Reviewed-by: Brian
replace String != operation with .equals

replaced the != operation performed on two String objects with ObjectUtils.equals

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Fixed some resource files issues, namely 1) invalid text and duplicate keys resulting from bad merge and 2) trailing spaces which can potentially cause UI issues.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Reviewed-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
- Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit df270d6387c362b960064ee5123c14782e767a19)
Signed-off-by: Daan Hoogland <daan@onecht.net>
Prevent DHCPACK for DHCPINFORM in the DHCP server

The orignal "dhcp-range=xxx,static" would only prohibit DHCPREQUEST from unknown
hosts, but not DHCPINFORM which can request routing information. This caused
trouble for some bridged networks outside CloudStack.

This patch would fix the issue, prevent dnsmasq from acking any unknown request.

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
Provide separate option for Windows Server 2012 R2 as
an OS type when registering template.
Renaming AclEntityType --> IAMEntityType
Renaming plugin packages to 'iam' instead if 'acl'
iam/plugin: Rename Acl to IAM everywhere
iam/server changes: Rename Acl to IAM
Renaming all beans in the xml files to use IAM insteda of Acl
renaming Acl to IAM in module.properties for the plugin
CLOUDSTACK-5674: Added few changes for CLOUDSTACK-567
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live storage migration of an already migrated volume fails
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
If a volume has been renamed upon migration update its volumePath to that of the new disk filename.

Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
CLOUDSTACK-6146. [VMware] [ESXi 5.5] Live VM migration of an already migrated VM (with storage) across clusters fails
In vCenter 5.5, once a volume is migrated the VMDKs are renamed to match the name of the VM.
Update volume path for every volume belonging to the VM to the corresponding new disk filename.

Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java
CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.