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 #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)
BISERVER-8386 - fixed the annoying exception being thrown at the start
of the biserver for the first time