Merge "Fix for failing test of testEOS because checksum takes too long" into jb-mr2-cts-dev