Merge "Make test-integration to rebase before build"