Build updates for Fedora 21.

This adds fc21 and removes fc19 from the 2.6 build. There are also two small
specfile fixes.
Merge pull request #1428 from beav/f21-building

Build updates for Fedora 21.
Merge remote-tracking branch 'origin/2.6-dev'