stip string of server
Merge branch 'cloud_manager' of https://github.com/dalang/puppet into cloud_manager

Conflicts:
	ext/windows/service/daemon.rb