CLOUDSTACK-6351 bugfix: Java1.6 is installed instead of Java7

Since epoch spesicifation doesn't work on RHEL6.3,
"java7" is used in the rpm spec.

Conflicts:
	packaging/centos63/cloud.spec
rbd: Create snapshot for cloning operations only when it is required

We used to create the snapshot after the copy from Secondary Storage,
but it could be that we never use the snapshot.

Now we check if the snapshot exists prior to performing the cloning operation
CLOUDSTACK-6445: Minor fixes in vm ha test
CLOUDSTACK-6317 [VMware] Tagged VLAN support broken for Management/Control/Storage traffic

Check if switch name detected from traffic label for management, storage, control traffic is null before falling back to default value.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
CLOUDSTACK-6564: OVS distributed routing: use file based OF rule updates

use ovs-ofctl replace flows by file name option to update the OF rules
instead of sequenetially configuring the rules.
CLOUDSTACK-6257: Adding function to check state of VM
log exceptions in ConsoleProxyServlet

- Added exception to the logger method parameters to make stack trace available
- removed checking of debug level, it does not save temporary object creation here

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
test for escapeHTML

- test added
- StringBuffer replaced with StringBuilder

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
test for HighAvailabilityManagerImpl

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
CLOUDSTACK-6472 listUsageRecords: Pull information from removed items as well, fixing NPEs/Null UUIDs with usage API calls.

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
LOUDSTACK-6475: cleanupVPC task - removed the transaction wrapping up multiple VPC destroy as the destroy operation has external calls, to prevent long-locked transaction.
Reviewed-by: Prachi Damle
CLOUDSTACK-6569: IAM - Regular user is able to listNetworks of another
user in the same domain , by passing account and domainId.
Fix compilation error due to cherry-pick CLOUDSTACK-6569.
CLOUDSTACK-6170 Corrected an issue related to the "Reinstall VM" command and managed storage with VMware
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>