Merge remote-tracking branch 'remotes/origin/fix-mapping' into feature-parralel_mapping_tests

public/mapping/src/main/scala/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala

@@ -141,8 +141,8 @@ class Mapping(val root: Configurable) extends QScript with SummaryQScript with S
 
     paired = input_R2.isDefined
 
-    if (readgroupId == null) readgroupId = sampleId.get + "-" + libId.get
-    else if (readgroupId == null) readgroupId = config("readgroup_id")
+    if (readgroupId == null)
+      readgroupId = config("readgroup_id", default = sampleId.get + "-" + libId.get)
 
     if (outputName == null) outputName = readgroupId