6bddb38cac
Change project's gradle version to 5.0, this requires to make some minor adjustments. Fixes: gh-6148
Change project's gradle version to 5.0, this requires to make some minor adjustments. Fixes: gh-6148