am d116ad43: resolved conflicts for merge of dae1c7c7 to jb-mr1-dev

* commit 'd116ad43bbaff849f23478dd8c58a8dca11a0b1c':
  Assert mean and stdev of update deltas