[paprefs/f20] Use module-combine-sink instead of module-combine

[belegdol]

Summary of changes:

  4fdbeca... Use module-combine-sink instead of module-combine (*)

(*) This commit already existed in another branch; no separate mail sent