[nuxwdog/f20] (5 commits) ...Merge cleanup.

[corsepiu]

Summary of changes:

  c23ca1b... Use Requires: java-headless rebuild (#1067528) (*)
  f23b6bd... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  f2a7965... Remove. (*)
  6eb0a56... Fix UnversionedDocDir-installation issues (FTBFS RHBZ #1106 (*)
  90090d6... Merge cleanup.

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