Address ISLANDORA-1045
resolved conflict
Merge branch 'ruebot-7.x-ISLANDORA-1045' into 7.x