[os-collect-config/f21] (3 commits) ...Merge branch 'f20'

[slagle]

Summary of changes:

  64548ce... Switch to rdopkg (*)
  df43540... Updated patches from f20-patches (*)
  b389614... Merge branch 'f20' (*)

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