[#6821] Refactored common last commit logic up and removed merge commit skipping

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>
[#6821] Remove any possibility of indefinite blocking and make test more clear

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>