Work around trailing spaces issue in Windows 10 v 2019-03.
Work around trailing spaces issue in Windows 10 v 2019-03.

JFLarvoire/SysToolsLib,JFLarvoire/SysToolsLib,JFLarvoire/SysToolsLib,JFLarvoire/SysToolsLib