DDF-615 - more fix attempts for travis build.