Bug fixes after test run. First pass all OK.

Change-Id: I88c6253c44ecceb574b9afb57934bc492eb13c4c
12 files changed
tree: 0648c22174414f2ba8dfc8ef45cb53e3cdd71c42
  1. service/