Fix and Test Patching#4

papeh wants to merge 2 commits intosillsdev:release/9.0sillsdev/FieldWorks:release/9.0from

papeh:feature/test-installerpapeh/FieldWorks:feature/test-installerCopy head branch name to clipboard