Replace average2020 argument with a 5yearAverage argument

[johanneskoch94]

At the moment, average2020 is TRUE by default, and replaces the 2020 value with the 2018-2022 average. 5 year times steps are returned, to be consistent, but the historical yearly values are maintained. Instead, it would be more coherent to also average those values