CLOUDSTACK-6040: Updated the ip addr validation in create port forwarding
Revert "Temporarily ignore getCpuSpeed test"

This reverts commit e4a91d3610fc8d7ce7718817fbc88318c5fe1e88.
Remove assertion

The assertion is built on the assumption that cpuinfo_max_freq is readable by user, which may not be universaly true.
Disable root disk size field -- not supported in backend
Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command
Contrail Event Interceptor fix

When project/domains are created,  our plugin code won't get invoked. Our
contrail plugin uses Event infrastructure provided by cloudstack to
receive these events and handle them accordingly. It is must to create
domains/projects before creating a virtual network/vm object in contrail
implementation. Hence our plugin must need a way to get notified about
project/domain events.
CLOUDSTACK-6054: Changes for making vmsync work for hyper-v. Made changes to PingCommand and
StartupCommand to return the state of all vms on the host.
CLOUDSTACK-5966 enable/disable global setting for service monitor in VR
CLOUDSTACK-5966 enable/disable global setting for service monitor in VR

corrected merged lines in sql file
pass isSourceNat to second ip on the same network
Fix unittest issue when you are in a locale that uses comma for decimal separation.
Added test for UriUtils.getUpdateUri

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Cleanup in UriUtils.getUpdateUri

- String instantiation replaced with StringBuilder and empty string constant

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
CLOUDSTACK-6066: Improved migration code to handle scenarios
                 according to hypervisor type
CLOUDSTACK-6056. Enabling static NAT rule for a portable public IP fails with error "Failed to enable static nat".
router.extra.public.nics isn't being honoured and so when an ip that is acquired from the additional VLAN range
is being configured it failed.
CLOUDSTACK-6089: Implement equals() method for ResourceTagResponse
so that the java Set can properly determine if a ResourceTagResponse
is unique. This ensures we don't get duplicate resource tags showing
up any time a UserVmResponse is crafted (which can be quite often
due to the way the responses are crafted).
Fix someone's broken push due to bad checkstyle (VMwareGuru.java unused imports)
CLOUDSTACK-6089: Use resource tag's key to determine match in
equals() method for ResourceTagResponse
CLOUDSTACK-6083 corrected firewall rule cidr load issue
Merge remote-tracking branch 'origin/master' into integration