BISERVER-10544 Scheduling an PRPT/Analyzer Report to be Emailed as an Excel Format sends an unopenable Excel Document
ANALYZER-2199 Administrator option disappears after switching to MSAD Authentication - Updated LDAP UI to also update pentaho.xml acl-voter role. Also now create backups of any property files automatically modified
Merge pull request #1160 from lucboudreau/master

[BISERVER-10886] Adds a missing call to lock.lock()
Merge pull request #1157 from mdamour1976/master

BISERVER-10544 Scheduling an PRPT/Analyzer Report to be Emailed as an Excel Format sends an unopenable Excel Document
Merge pull request #1161 from pminutillo/localdev

ANALYZER-2199 Administrator option disappears after switching to MSAD Au...
BISERVER-10889 Register the iplatform-import-handler
Merge pull request #1167 from mdamour1976/BISERVER-10889-2

BISERVER-10889 Register the iplatform-import-handler
MONDRIAN-1835 - handling null passwords in PasswordHelper
Merge pull request #1168 from kurtwalker/MONDRIAN-1835

MONDRIAN-1835 - handling null passwords in PasswordHelper
BISERVER-10792 - IE8/IE9 -Xaction Cancel button causes IE to crash or give stack overflow error
BISERVER-10875 - Fixed the LDAP performance issues
Merge pull request #1170 from rmansoor/master

BISERVER-10875 - Fixed the LDAP performance issues
Merge pull request #1169 from rfellows/dev

BISERVER-10792 - IE8/IE9 -Xaction Cancel button causes IE to crash or give stack overflow error
[MONDIRAN-1844] Fixes sporadic issues with the catalog helper and the olap4j system listener.
Merge branch 'master' of https://github.com/pentaho/pentaho-platform