update and run scale down patches

[enxebre]

Update and apply the scale down patches

[ingvagabund]

/lgtm
/approve

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ingvagabund

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [ingvagabund]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[ingvagabund]

error: unable to signal to artifacts container to terminate in pod e2e-aws, triggering deletion: could not run remote command: unable to upgrade connection: container not found ("artifacts") looks like internal error, not related.
/test e2e-aws

[ingvagabund]

error: unable to check your credentials - pass --skip-check to bypass this error: Get https://registry.svc.ci.openshift.org/v2/: net/http: TLS handshake timeout
/test e2e-aws

[wking]

Cross-linking kubernetes-sigs/cluster-api#513, which seems to be the upstream side of the "Delete specific machine from a machineset when scaling down" patch. I don't see an upstream commit for "Sort machines before syncing", but maybe it's been squashed in or some such.