MOTD Enabled prints MOTD twice on Ubuntu

[jribar]

Is your feature request related to a problem? Please describe.
Upgraded from an older release to 9.6.0 which now disables MOTD by default. It does this by disabling the dynamic MOTD and setting PrintMotd to no.

When MOTD is enabled with ssh_print_motd, PrintMotd is set to yes and the dynamic MOTD is left enabled. This results in the contents of /etc/motd appearing twice upon login.

Prior to the upgrade, and by default, MOTD was displayed via PAM and not through OpenSSH.

There is no option to avoid this behavior as ssh_print_motd disables/enables both the dynamic Ubuntu MOTD and the MOTD disabled through OpenSSH.

Describe the solution you'd like
Separate variables to control both the display of MOTD through OpenSSH and the disabling of the dynamic MOTD.

Describe alternatives you've considered
Downgrading to < 9.0.0.

Additional context

[rndmh3ro]

Hey @jribar, thanks for bringing this bug up. We need to fix that.
Are you up for a PR?