Merge branch 'rs/checkout-some-states-are-const' into maint

Code cleanup. * rs/checkout-some-states-are-const: checkout: constify parameters of checkout_stage() and checkout_merged()