[nesc/f20] (6 commits) ...Merge fix.

[Christopher Meng]

Summary of changes:

  05d4ea3... Use Requires: java-headless rebuild (#1067528) (*)
  eaf747f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  800c519... Update to new upstream releases (*)
  402d6b0... Disable FSF address patch (*)
  0b7a253... Cleanup. (*)
  fdd122a... Merge fix.

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