PDI-9268 Update BI Server EE assembly to assemble PDI EE
Merging builds
Merge remote-tracking branch 'upstream/master' into pdi9268
Updating xml files
DIServer login
Merge remote-tracking branch 'upstream/master' into pdi9268
Merge pull request #67 from pminutillo/master

BISERVER-8343 Modify CommandLineProcessor to also take short option values
Update extensions/src/org/pentaho/platform/plugin/services/messages/messages.properties

Removed the conflict messages
BISERVER-8170 Fix ACLs not processing on existing folders.
Merge pull request #68 from tkafalas/master

BISERVER-8360 Fix ACLs not processing on folders that already exist.
BISERVER-8285 - Fixing unit test
Merge pull request #69 from rmansoor/master

BISERVER-8285 - Fixing unit test
Fix for BISERVER-8364
Change terminology on Import | Advance Options | File Permission and
File Ownership
[ANALYZER-1850] Rename FORE_COLOR to CHART_SERIES_COLOR
BISERVER-8245 When Editing prpt report schedules - selections are
blanked out and invalid
BISERVER-8366 No validation on email address for enabling next/finish in
the email/schedule dialog
BISERVER-8285 - fixing unit test
Merge pull request #70 from rmansoor/master

BISERVER-8285 - fixing unit test
PDI-9267: DI Server 5.0 - Spoon Login
Merge pull request #71 from brosander/pdi9268

Reviewed and discussed with @dkincade (additional tech debt topics added for future work)