master to future merge

Merges master into future, taking into account all the issues with the git history described in https://its.cern.ch/jira/browse/LBCORE-1330 The result is a clean future branch that contains everything from master plus the future developments but that cannot be directly merged back into master without loss of commits.