Merge "Stagger airship integration tests"