Merge pull request #461 from john-hill/PLFM-1926

Plfm 1926
PLFM-1933, applied to release-w
Merge pull request #467 from brucehoff/release-w

PLFM-1933, applied to release-w
Merge pull request #469 from john-hill/migration-status

added migration to the filter
new tets passing
added new
Merge pull request #471 from john-hill/PLFM-1937

Plfm 1937
Merge branch 'develop' into PLFM-1937
Merge pull request #472 from john-hill/PLFM-1937

Plfm 1937
Support using System props
Merge pull request #473 from xschildw/migrator-opt-file

Support using System props
Merge pull request #474 from xschildw/migrator-opt-file

Support using System props
fix build for PLFM-1894
Merge pull request #478 from dburdick/plfm-1894

fix build for PLFM-1894
change paths to local
Merge pull request #479 from dburdick/plfm-1894

change paths to local
Merge branch 'release-w' into develop