Only display the UPnP messages for MP games, not for skirmish.
Fix the mac build for 8f4adda2.

Refs. ticket:4095.
Merge branch 'bugfixes'

Conflicts:
	src/multiint.cpp
Merge branch 'bugfixes'