Fix Mergify config
Fix Mergify config

@roesslerj pointed out that Mergify sometimes merges base into head, rather than rebasing head against base. This fix should solve this issue and also introduces less-verbose rule names.

retest/recheck,retest/recheck