FIX: Fedora 21 builds
Merge branch 'fix-fc21' into devel
Merge branch 'devel' of github.com:cvmfs/cvmfs into devel