Merge "Clean up SouthboundMapper (and fix createQosType())"