Merge branch asterisk-20.3.0 into devel properly

This "merge" merges the proper history by reverting an accidentally squashed merge and doing a proper merge commit after.

Thus, there is no change to the actual code.

History is best viewed locally. "To hide" the merged commits in git-log-output one can use --first-parent