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

Support using System props