Merge pull request juju#13563 from hpidcock/merge-2.9-develop-2021-12-10

juju#13563

Forward ports:
- juju#13543
- juju#13537
- juju#13549
- juju#13499
- juju#13545
- juju#13547
- juju#13550
- juju#13551
- juju#13553
- juju#13554
- juju#13555
- juju#13558
- juju#13497
- juju#13481
- juju#13560
- juju#13557
- juju#13561
- juju#13541
- juju#13559