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 branches 'master' and 'dev-local-tmb' into dev-local-tmb
Fix command letter "p" for path
Merge pull request #62 from pentaho-tband/dev-local-tmb

BIServer 7819 Command Line Interface - fixed typo for "p" path
BISERVER-8245 When Editing prpt report schedules - selections are
blanked out and invalid
BISERVER-8345 - Fixed NPE while generating inmemory datasource for
mondrian
Merge pull request #63 from rmansoor/master

 BISERVER-8345 - Fixed NPE while generating inmemory datasource
BISERVER-8345 - Fixed some unit test failures
Merge remote-tracking branch 'upstream/master' into pdi9268
Merge pull request #64 from rmansoor/master

BISERVER-8345 - Fixed some unit test failures
BISERVER-8345 - Fixing unit test
Merge pull request #66 from rmansoor/master

 BISERVER-8345 - Fixing unit test
BISERVER-8343 Modify CommandLineProcessor to also take short option values
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.