FALCON-158 Fix failing jenkins nightly build. Contributed by Venkatesh Seetharam