Unify the logic of merging parameters

FIXME: maybe this kind of logic should be implemented in
library.merge_two_parameters.
Merge branch 'master' of github-fds:FlightDataServices/FlightDataAnalyzer