Merge pull request #471 from john-hill/PLFM-1937

Plfm 1937
Merge pull request #474 from xschildw/migrator-opt-file

Support using System props
Merge branch 'release-w' into develop