VIVO-230 Make the log messages more explicit, so we have a chance of diagnosing this.
Merge branch 'maint-rel-1.6' into develop