Merge pull request #662 from john-hill/PLFM-1592-a

Added log sweeping to workers
Merge pull request #666 from eric-wu/quickfix

Fix compilation error reported on Hudson
PLFM-1509 Query should not accept createdby as a query parameter.
added a profile proxy
added test
Merge pull request #668 from eric-wu/develop

PLFM-1509 Query should not accept createdby as a query parameter.
Merge pull request #667 from eric-wu/quickfix

PLFM-1815 Refactor DoiObjectType and ObjectType.
PLFM-2139 REST API cods for the methods around evaluation ACLs.
Use singular form per the Java doc standards.
changed the collate worker to process all types per run
Merge pull request #672 from john-hill/collate-time

changed the collate worker to process all types per run
Merge pull request #671 from eric-wu/develop

PLFM-2139 REST API cods for the methods around evaluation ACLs.
renamed java client
also renamed admin client
set the collate timer back to its original value
Merge branch 'develop' into client-proxy
Merge pull request #669 from john-hill/client-proxy

Client proxy
Use log4j2
fixed bad merge
Merge pull request #675 from john-hill/fix-merge

fixed bad merge