Setup: Fix MySQL version check.
Setup: Fix MySQL version check part 2
More PSR coding compliance
Merge branch 'master' into admin-layout-update