Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  MigrateToNoteDb#run: ensure that exceptions are logged

Change-Id: I498bdc5a0822dde0834e765dd3ca78a644d88e06