FIX: Fixed exception during initial page rendering in python 2.6 in special cases

(Internal error: putenv() argument 2 must be string, not list)

Conflicts:
	ChangeLog
Merge branch 'master' of mathias-kettner.de:check_mk

Conflicts:
	ChangeLog
FIX: mk_jolokia: Handling spaces in application server instances correctly