Fix problem with failing system tests.
 # [#31525] Files uninstall is failing due to missing variable. Thanks
Michael Babker (Fix #1564)
Merge remote-tracking branch 'origin/master'