coding style fixes, some PHPStorm inspection fixes, improved readability of code, few refactorings, all as part of our code cleanup strategy
Merge branch 'master' into readabilityImprovements

Conflicts:
	core/Tracker/Db/Mysqli.php
Merge pull request #6343 from piwik/readabilityImprovements

 improve readability of code