Merge branch 'backport/marconi_skylake' into dev

Conflicts:
	server/rcm_server_slurm.py

Author: luigi-calori

server/rcm_base_server.py

@@ -401,7 +401,7 @@ def execute_new(self):
                 tunnel=self.get_use_tunnel()
             else:
                 tunnel='y'
-            #n+='ib0'
+            n+=self.pconfig.confdict.get(('platform','nodepostfix'),'')
 #        except Exception as e:
         except Exception,inst:
 	    sys.stderr.write("%s: %s RCM:EXCEPTION" % (inst, traceback.format_exc()))

server/rcm_server_slurm.py

@@ -150,7 +150,6 @@ def get_queue(self,testJobScriptDict=None):
       def get_jobs(self, U=False):
           logger = logging.getLogger("basic")    
           logger.debug("get_jobs")
-          #bad.. why specify the queue?"(retval,stdout,stderr)=self.prex(['squeue', '-o %i#%t#%j#%a','-h','-p','bdw_usr_dbg','-u',self.username])
           (retval,stdout,stderr)=self.prex(['squeue', '-o %i#%t#%j#%a','-h','-u',self.username])
           logger.debug("squeue output: "+str(retval)+" \n"+str(stdout)+" \n"+str(stderr))