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

* commit 'a00f78c853328979f0bc7f9dea3b29bb587b1543':
  Fix for failing test of testEOS because checksum takes too long