setup a worker to merge files
finished worker
added merge worker factory test
Merge pull request #624 from bkng/develop

Javadocs for EntityBundleController, EvaluationController
merged with develop
Merge pull request #626 from john-hill/merge-worker

Merge worker
PLFM-2027: small fixes for Javadocs on EntityBundleController