buildserver - bugfixes for ensuring that services are stopped.