CLOUDSTACK-6435: Add new Command line options to setup/bindir/cloud-setup-databases.in and remove OS specific commands
CLOUDSTACK-6477: UI - Load Balancing - add VMs => fix error 'Unable to decode parameter vmidipmap[0].vmip[]; if specifying an object array, please use parameter[index].field=XXX, ~ '
    Applied Tina's patches for removing the xapi jar
CLOUDSTACK-6438
CLOUDSTACK-6442
  XAPI plugins must be copied to XS master first.
CLOUDSTACK-6487: UI > Add LDAP Account - fix a bug that a LDAP account that does not have email and all LDAP accounts below it are missing from the listing.
CLOUDSTACK-6488 Fixed an issue where the "path" field was not being set properly in the DB when the volume had a snapshot taken of it
Fixed few Licensing Issues

Added licensing information to files

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
0001-JiraId-CLOUDSTACK-6282.patch Added automated tests for Instances API calls to test_escalations.py file and added utility functions to base.py file
CLOUDSTACK-6492: fixed strftime import and its usage in deployDataCenter.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
CLOUDSTACK-6494: Typing a pipe '|' character in VM console returns a question mark and pipe '?|'.
Fixed issues in CLOUDSTACK-6489

Fixed issues for CLOUDSTACK-6489
Along with fixed few indent issues.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
improved ldap logging. added stacktrace in debug level incase of exceptions.

Conflicts:
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapContextFactory.java

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
CLOUDSTACK-6338  [Automation] Failed to NetScaler Device with error
checkstyle fix for commit 8e2e8e5e8ab492fa40dedc0788c0ac61f912487b

improved ldap logging. added stacktrace in debug level incase of exceptions.

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
CLOUDSTACK-6282: Added Automated tests to test_escalations.py for Security Groups, VPN Customer Gateways, Templates, ISO's CS API calls

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
CLOUDSTACK-6492: fixed localtime import and its usage in deployDataCenter.py
Add pre/post-state transition status to messages published on event bus by UserVmStateListener. Allow system VM resource state post-transitions to be published.
List view, dialog VM select: Widen name field to better fit IP subselect box
CLOUDSTACK-6170 (VMware root-disk support for managed storage)
CLOUDSTACK-6436: listResourceDetails - don't return entries set with display=false, by default

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java