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

Added log sweeping to workers
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
Use log4j2
Merge pull request #674 from xschildw/FixLog4jMig

Use log4j2
Merge branch 'release-12' into develop