TD-3986 (Address issues identified by ReSharper that were created in 1.8.0 sprint)
Merge branch 'develop' of https://github.com/sillsdev/pathway into develop