r7563: svcctl patches from Marcin; have cleaned up formating and am checking the...