When UUID field is null for existing records, set it to id

Conflicts:
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
CLOUDSTACK-2115:  remove the trailing '\n' to get correct XS network mode
CLOUDSTACK-2475: Failed to create PF rules with Cisco VNMC as the port pool object name is exceeding the max limit
Ip and port pool object names in VNMC were created by appending guest vlan, public ip and id of corresponding rule for better readability. This resulted in the name exceeding max. length allowed.
Shortened the name by removing public ip part from it.
CLOUDSTACK-2467 and CLOUDSTACK-2466
CLOUDSTACK-2487: Show error while adding acl_item to default ACL
Updated network acl service test to avoid default ACL modification
CLOUDSTACK-2459 Fix the scale vm tests
don't let requests logs

requests logs to the logger making it hard to distinguish marvin logs
from http logs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts
CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host
Fixed by updating the patch files that has
 entries to copy scipts on xenserver. Here we added
 Add-To-VCPUs-Params-Live.sh

Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.

Signed Off by - Nitin Mehta <nitin.mehta@citrix.com>
CLOUDSTACK:685 Fix user stat collection in PrepareStop part of VirtualNetworkApplianceImpl
CLOUDSTACK-2369 fixed adding same private gw twice
CLOUDSTACK-2515: Verify if the targetPath isn't null before comparing
CLOUDSTACK-2491:NTier: Creation of ACL Rule for protocol AH (51) and ESP (50) Fails
CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
CLOUDSTACK-2134 updated acl checks for aquiring nic secondary ip
Midonet Plugin bugfixes

* Updated SQL upgrade scripts to include midonet configs.
* Fixed bug where default ICMP allow rule was missing
  on static NAT creation, keeping VMs from being able
  to ping the gateway.
* Changed the filter in the MidoNetElement callbacks to allow
  calls when Midonet is configured.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
CLOUDSTACK-962: Because of the same reason to this (CLOUDSTACK-685)
https://reviews.apache.org/r/11157/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
Summary: Use hypervisor as clock source for system vms

BUG-ID: CLOUDSTACK-2492
Bugfix-for: 4.1,master
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1368635782 -0600
Merge branch 'master' into ui-vpc-redesign

Conflicts:
	ui/scripts/vpc.js