Merge branch 'master' of https://github.com/pentaho/pentaho-platform
BISERVER-8790 - correcting logging code that caused an error when run on the server.
[PRD-3270] Add CDA Plugin to BIServer
[PRD-3270] Add CDA Plugin to BIServer
Merge pull request #634 from pentaho-tband/PRD-3270

{PRD-3270] ADD CDA Plugin to BI Server
Merge pull request #635 from kurtwalker/master

biserver-8790
Merge pull request #636 from jcaldwell/dev

BISERVER-9232 - Enable upload / download in PUC only for administrators.
BISERVER-9466: load op mart zip at startup of bi server
[PRD-3270] REVERT CDA Plugin to BIServer
[PRD-3270] REVERT CDA Plugin to BIServer
Merge pull request #638 from pentaho-tband/PRD-3270

{PRD-3270] REVERT CDA Plugin
Merge pull request #637 from sflatley/BISERVER-9466

BISERVER-9466: load op mart zip at startup of bi server
BISERVER-9468 - Trash - Purge All Deleted Items - able to click when there is nothing in trash. Confirm Message does not update, Error message needs formatting.
BISERVER-9468 - Trash - Purge All Deleted Items - able to click when there is nothing in trash. Confirm Message does not update, Error message needs formatting.
Merge pull request #641 from jeffreythomas/dev2

Trash Changes
BISERVER-9266 Add custom servlet error page.