Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev