Code review comment for lp:~thomas-voss/media-hub/decouple-service-skeleton-and-implementation

1. decouple-service-skeleton-and-implementation
2. Merge into trunk