Merge pull request #2231 from tonk/devel

Service command handling fix when no upstart config file
Use regular strings to allow tests to work
Fix references to user.username to be user.name