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 branch 'develop' into PLFM-1937
Merge pull request #472 from john-hill/PLFM-1937

Plfm 1937