Fix merge and remove stale import

Author: Vasileios Karakasis

reframe/core/backends.py

@@ -18,7 +18,7 @@
 _launchers = {}
 _scheduler_backend_modules = [
     'reframe.core.schedulers.local',
-    'reframe.core.schedulers.lsf'
+    'reframe.core.schedulers.lsf',
     'reframe.core.schedulers.pbs',
     'reframe.core.schedulers.oar',
     'reframe.core.schedulers.sge',

reframe/core/schedulers/registry.py

@@ -41,4 +41,3 @@ def getscheduler(name):
 import reframe.core.schedulers.pbs     # noqa: F401, F403
 import reframe.core.schedulers.sge     # noqa: F401, F403
 import reframe.core.schedulers.slurm   # noqa: F401, F403
-import reframe.core.schedulers.torque  # noqa: F401, F403