Conflicts: lib/db/install.xml lib/db/upgrade.php version.php
This issue is a part of the MDL-47194 Task. This issue is a part of the MDL-39707 Epic.