Resolve #3600981 "Conflict with drupallms"

Gorka G.requested to merge
issue/lms_xapi-3600981:3600981-conflict-with-drupallms into 1.0.x

Closes #3600981

Merge request reports