SP-644 Change logic to compare existing catalog name and different
datasource - return 7 (Existing XMLA Catalog)
Merge pull request #1114 from pentaho-tband/SP-644

SP-644 Change logic to compare existing catalog name and different
BISERVER-10666 - SP-904 - Fix LDAP/JDBC authentication issue
Merge pull request #1119 from rmansoor/5.0

BISERVER-10666 - SP-904 - Fix LDAP/JDBC authentication issue
SP-494 - Moved jtds jar and removed dupe hsql, h2 jar from WEB-INF/lib