CRM-13992 : QA fixes mentioned in #comment-57745