- delete a service, created in a test to execute a patch
- assign timeouts from conf file, rather than use defaults
- add Error message, to make sure we log the amount of time spent by the
test awaiting service state transitions.
Change-Id: Ib3bbc4480ad8afa386cd46ba40d65b0781917af5