Merge branch '4.5-fixes' of https://github.com/laurents59/sonarqube.git
into 4.5-fixes

Conflicts:
	README.md
Merge branch '4.5-fixes' of https://github.com/laurents59/sonarqube into 4.5-fixes

Conflicts:
	README.md
Merge branch '4.5-fixes' of https://github.com/laurents59/sonarqube into 4.5-fixes