Merge pull request #3623 from ethomson/rebase_with_commit rebase: additional setup tests of exotic behavior