conditionalize restore in xrootd cleanup tests (SOFTWARE-3485)

Author: edquist

osgtest/tests/test_840_xrootd.py

@@ -7,7 +7,8 @@ class TestStopXrootd(osgunittest.OSGTestCase):
 
     def test_01_stop_xrootd(self):
         if core.state['xrootd.backups-exist']:
-            files.restore(core.config['xrootd.config'], "xrootd")
+            if core.PackageVersion('xrootd') < '4.9.0':
+                files.restore(core.config['xrootd.config'], "xrootd")
             files.restore('/etc/xrootd/auth_file', "xrootd")
             if not core.rpm_is_installed('xrootd-lcmaps'):
                 files.restore('/etc/grid-security/xrd/xrdmapfile', "xrootd")