Merge branch 'merge-asterisk-20.3.0-properly' into devel

This "merge" merges the proper history of Asterisk 20.3.0 by reverting
an accidentally squashed merge and doing a proper merge commit after.
Thus, there is no change to the actual code.