This MR is in preparation for the CiviCRM version increment to 5
We should merge this after the switch to v5 is publicly announced and releases are available for download.