Merge branch 'maint' * maint: t7500: fix flipped actual/expect lib-rebase: document exec_ in FAKE_LINES