Merged in changes to support a Debian (Ubuntu) client, which is primarily a Debian specific service script