am da13b894: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'da13b894ec13c975b027b78fa7a6ff07208c8fd3':
  Add logging to try and track down bug 7643792