Merge branch 'hotfix_mysql_charset' into upstream-4.0-stable
print log message to the console when debug level is lower then LogErr
b: Fix foreign key assignation in job (machine_id)
Release : SDS-4.4-stable Setting vishnu version to 4.0.4
Merge branch 'upstream-hotfix_job_machineforeignkey' into upstream-master
Merge branch 'upstream-hotfix_job_machineforeignkey' into upstream-4.0-stable
print log message to the console when debug level is lower then LogErr
Merge branch '4.0-stable' of github.com:absila/vishnu into 4.0-stable
Merge remote-tracking branch 'Amine/4.0-stable' into upstream-master

Conflicts:
	CMakeLists.txt
	FMS/doc/man/docbook/usermanFMS-template.docbook
	TMS/doc/man/docbook/usermanTMS-template.docbook
	UMS/doc/man/docbook/adminman-template.docbook
	UMS/doc/man/docbook/userman-template.docbook
	swigAPI/VishnuLib/pom.xml
improved OpenNebula-based job handling
o: renamed variables