Eng 5072

Use ParameterConverter to get better param conversion for snapshot restores. There is a Pro pull request also mainly for tests.