Merge pull request #1461 from setowns1/bug

Fixes to support analysis_server_plugin installed on Windows
Convert strings to FileRefs for File variables.