Fixes ZEN-14614:  Need quotes when service has spaces in name