Applied Tina's patches for removing the xapi jar
Add some missing localization strings
Don't let VMsync touch the VM if VM has been scheduled for HA but HA is not yet running.
BUG-ID: CS-19697: Deal with possible DB deadlock issue, return the job into queue for next turn
Do app-level iteration to avoid mysql deadlocks
WIP: Instance wizard UI: Support multi-disk offerings

Adds front-end support to instance wizard UI for service offerings
supporting multiple disks.

The UI changes will show if a list 'multipleDisks: []' is passed with
the disk offering data options.
Revert "CLOUDSTACK-6286: added FinishAggregationCommand and StartAggregationCommand to simulator"

This reverts commit 9ddfbe11286b874ea7717ec3545daff4a20d3865. REverting as the dependency is not there in git.
CLOUDSTACK-6286: [Automation] VM deployment is failing in simulator
Added AggregationContolCommand to simulator
Fix problem string comparison with unicode

Conflicts:
	test/integration/component/test_egress_fw_rules.py