Merge branch 'hotfix/2.1.11-jrandall-listxattr' into develop
Merge branch 'master' of https://github.com/wtsi-hgi/cvmfs into develop
Changed name of IgnoreFileP() to IgnoreFilePredicate() for clarity.

Fixed some inadvertent tab-to-spaces whitespace issues.
Merge branch 'master' of https://github.com/cvmfs/cvmfs into cvmfs-master

Conflicts:
	cvmfs/sync_mediator.cc
	cvmfs/sync_mediator.h
Merge branch 'master' of https://github.com/cvmfs/cvmfs into cvmfs-master-fof

Conflicts:
	cvmfs/cvmfs_server
Merge branch 'feature/overlayfs' into merge-fiff

Conflicts:
	cvmfs/sync_mediator.cc
	cvmfs/sync_mediator.h
Complete implementation of OverlayFS, although the handling of aufs/overlayfs
configuration is somewhat of a hack and also incomplete (it is hard-coded to
overlayfs at the moment in some places).
Fixed spelling "mising" -> "missing"
Added configuration options to enable overlayfs (aufs is default in all cases).
in cvmfs_server and swissknife.

e.g. use "cvmfs_server mkfs -f overlayfs" to create a filesystem using overlayfs
Merge branch 'feature/overlayfs' into develop
Merge branch 'develop'

Conflicts:
	cvmfs/cvmfs_server