FALCON-724 Build fails as Integration test fails. Contributed by Balu Vellanki