pull from upstream cvmfs into wtsi-hgi/master