up-to-date wmi-client
(cherry picked from commit 3e54eeb)
up-to-date pandorafms_server (apply 2014-11-26 changes)
Merge branch 'master' into work

Conflicts:
	net-mgmt/pandorafms_server/Makefile
	net-mgmt/pandorafms_server/pkg-plist